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

Cleanup

Browse Source
This commit is contained in:
Dmitrijs Milajevs
2013-09-05 15:30:37 +02:00
parent 9a50d9de17
commit fa96143aeb
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
testing/test_dsession.py
View File

@@ -201,5 +201,4 @@ def test_report_collection_diff_different():
try: try:
report_collection_diff(from_collection, to_collection, 1, 2) report_collection_diff(from_collection, to_collection, 1, 2)
except AssertionError as e: except AssertionError as e:
assert unicode(e) == error_message assert unicode(e) == error_message

8
xdist/dsession.py
View File

@@ -135,8 +135,12 @@ class LoadScheduling:
# XXX allow nodes to have different collections # XXX allow nodes to have different collections
first_node, col = list(self.node2collection.items())[0] first_node, col = list(self.node2collection.items())[0]
for node, collection in self.node2collection.items(): for node, collection in self.node2collection.items():
if collection != col: report_collection_diff(
report_collection_diff(col, collection, first_node.gateway.id, node.gateway.id) col,
collection,
first_node.gateway.id,
node.gateway.id,
)
self.pending = col self.pending = col
if not col: if not col: