[svn r38106] making tests independent of --dist implications
--HG-- branch : trunk
This commit is contained in:
parent
8258b40fd6
commit
d791086561
|
@ -271,46 +271,62 @@ def test_custom_NONpython_collection_from_conftest():
|
||||||
assert len(l) == 1
|
assert len(l) == 1
|
||||||
|
|
||||||
def test_order_of_execution_generator_same_codeline():
|
def test_order_of_execution_generator_same_codeline():
|
||||||
skipboxed()
|
o = tmpdir.ensure('genorder1', dir=1)
|
||||||
test_list = []
|
o.join("test_order1.py").write(py.code.Source("""
|
||||||
expected_list = range(6)
|
def test_generative_order_of_execution():
|
||||||
|
test_list = []
|
||||||
|
expected_list = range(6)
|
||||||
|
|
||||||
def list_append(item):
|
def list_append(item):
|
||||||
test_list.append(item)
|
test_list.append(item)
|
||||||
|
|
||||||
|
def assert_order_of_execution():
|
||||||
|
print 'expected order', expected_list
|
||||||
|
print 'but got ', test_list
|
||||||
|
assert test_list == expected_list
|
||||||
|
|
||||||
def assert_order_of_execution():
|
for i in expected_list:
|
||||||
print 'expected order', expected_list
|
yield list_append, i
|
||||||
print 'but got ', test_list
|
yield assert_order_of_execution
|
||||||
assert test_list == expected_list
|
"""))
|
||||||
|
config = py.test.config._reparse([o])
|
||||||
for i in expected_list:
|
session = config.initsession()
|
||||||
yield list_append, i
|
session.main()
|
||||||
yield assert_order_of_execution
|
l = session.getitemoutcomepairs(Passed)
|
||||||
|
assert len(l) == 7
|
||||||
|
|
||||||
def test_order_of_execution_generator_different_codeline():
|
def test_order_of_execution_generator_different_codeline():
|
||||||
skipboxed()
|
o = tmpdir.ensure('genorder2', dir=2)
|
||||||
test_list = []
|
o.join("test_genorder2.py").write(py.code.Source("""
|
||||||
expected_list = range(3)
|
def test_generative_tests_different_codeline():
|
||||||
|
test_list = []
|
||||||
|
expected_list = range(3)
|
||||||
|
|
||||||
def list_append_2():
|
def list_append_2():
|
||||||
test_list.append(2)
|
test_list.append(2)
|
||||||
|
|
||||||
def list_append_1():
|
def list_append_1():
|
||||||
test_list.append(1)
|
test_list.append(1)
|
||||||
|
|
||||||
def list_append_0():
|
def list_append_0():
|
||||||
test_list.append(0)
|
test_list.append(0)
|
||||||
|
|
||||||
def assert_order_of_execution():
|
def assert_order_of_execution():
|
||||||
print 'expected order', expected_list
|
print 'expected order', expected_list
|
||||||
print 'but got ', test_list
|
print 'but got ', test_list
|
||||||
assert test_list == expected_list
|
assert test_list == expected_list
|
||||||
|
|
||||||
yield list_append_0
|
yield list_append_0
|
||||||
yield list_append_1
|
yield list_append_1
|
||||||
yield list_append_2
|
yield list_append_2
|
||||||
yield assert_order_of_execution
|
yield assert_order_of_execution
|
||||||
|
"""))
|
||||||
|
config = py.test.config._reparse([o])
|
||||||
|
session = config.initsession()
|
||||||
|
session.main()
|
||||||
|
l = session.getitemoutcomepairs(Passed)
|
||||||
|
assert len(l) == 4
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def test_documentation_virtual_collector_interaction():
|
def test_documentation_virtual_collector_interaction():
|
||||||
|
|
Loading…
Reference in New Issue