IQ.Lvbs/pytest-xdist
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix issue 93 of pytest - avoid delayed teardowns

Browse Source
This commit is contained in:
holger krekel
2011-12-02 21:03:29 +00:00
parent d5ff8b066a
commit 1f6d410481
9 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
testing/test_dsession.py
View File

@@ -48,11 +48,11 @@ class TestEachScheduling:
assert sched.node2collection[node1] == collection
assert sched.node2collection[node2] == collection
sched.init_distribute()
assert not sched.tests_finished()
assert sched.tests_finished()
assert node1.sent == ['ALL']
assert node2.sent == ['ALL']
sched.remove_item(node1, collection[0])
assert not sched.tests_finished()
assert sched.tests_finished()
sched.remove_item(node2, collection[0])
assert sched.tests_finished()
@@ -66,7 +66,7 @@ class TestEachScheduling:
assert sched.collection_is_completed
assert sched.node2collection[node1] == collection
sched.init_distribute()
assert not sched.tests_finished()
assert sched.tests_finished()
crashitem = sched.remove_node(node1)
assert crashitem
assert sched.tests_finished()
@@ -88,7 +88,7 @@ class TestLoadScheduling:
assert sched.node2collection[node1] == collection
assert sched.node2collection[node2] == collection
sched.init_distribute()
assert not sched.tests_finished()
assert sched.tests_finished()
assert len(node1.sent) == 1
assert len(node2.sent) == 1
x = sorted(node1.sent + node2.sent)
@@ -109,6 +109,7 @@ class TestLoadScheduling:
sched.addnode_collection(node1, col)
sched.addnode_collection(node2, col)
sched.init_distribute()
#assert not sched.tests_finished()
sent1 = node1.sent
sent2 = node2.sent
chunkitems = col[:sched.ITEM_CHUNKSIZE]

2
testing/test_remote.py
View File

@@ -138,6 +138,7 @@ class TestSlaveInteractor:
ids = ev.kwargs['ids']
assert len(ids) == 1
slave.sendcommand("runtests", ids=ids)
slave.sendcommand("shutdown")
ev = slave.popevent("testreport") # setup
ev = slave.popevent("testreport")
assert ev.name == "testreport"
@@ -145,7 +146,6 @@ class TestSlaveInteractor:
assert rep.nodeid.endswith("::test_func")
assert rep.passed
assert rep.when == "call"
slave.sendcommand("shutdown")
ev = slave.popevent("slavefinished")
assert 'slaveoutput' in ev.kwargs