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

refine distribution fractions and make it dependend on the duration

Browse Source 
of the last test in a node's set.
This commit is contained in:
holger krekel
2014-01-27 12:39:43 +01:00
parent e26d4486fc
commit ffa156ced5
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xdist/dsession.py
View File

@@ -40,7 +40,7 @@ class EachScheduling:
if len(self.node2pending) >= self.numnodes: if len(self.node2pending) >= self.numnodes:
self.collection_is_completed = True self.collection_is_completed = True
def remove_item(self, node, item_index): def remove_item(self, node, item_index, duration=0):
self.node2pending[node].remove(item_index) self.node2pending[node].remove(item_index)
def remove_node(self, node): def remove_node(self, node):
@@ -91,12 +91,16 @@ class LoadScheduling:
if len(self.node2collection) >= self.numnodes: if len(self.node2collection) >= self.numnodes:
self.collection_is_completed = True self.collection_is_completed = True
def remove_item(self, node, item_index): def remove_item(self, node, item_index, duration=0):
node_pending = self.node2pending[node] node_pending = self.node2pending[node]
node_pending.remove(item_index) node_pending.remove(item_index)
# pre-load items-to-test if the node may become ready # pre-load items-to-test if the node may become ready
if self.pending: if self.pending:
if duration >= 0.1 and node_pending:
# seems the node is doing long-running tests
# so let's rather wait with sending new items
return
# how many nodes do we have remaining per node roughly? # how many nodes do we have remaining per node roughly?
num_nodes = len(self.node2pending) num_nodes = len(self.node2pending)
# if our node goes below a heuristic minimum, fill it out to # if our node goes below a heuristic minimum, fill it out to
@@ -142,8 +146,8 @@ class LoadScheduling:
return return
# how many items per node do we have about? # how many items per node do we have about?
items_per_node = len(self.collection) // len(self.node2pending) items_per_node = len(self.collection) // len(self.node2pending)
# take half of it for initial distribution, at least 1 # take a fraction of tests for initial distribution
node_chunksize = max(items_per_node // 2, 1) node_chunksize = max(items_per_node // 4, 1)
# and initialize each node with a chunk of tests # and initialize each node with a chunk of tests
for node in self.node2pending: for node in self.node2pending:
self._send_tests(node, node_chunksize) self._send_tests(node, node_chunksize)
@@ -317,7 +321,7 @@ class DSession:
def slave_testreport(self, node, rep): def slave_testreport(self, node, rep):
if not (rep.passed and rep.when != "call"): if not (rep.passed and rep.when != "call"):
if rep.when in ("setup", "call"): if rep.when in ("setup", "call"):
self.sched.remove_item(node, rep.item_index) self.sched.remove_item(node, rep.item_index, rep.duration)
#self.report_line("testreport %s: %s" %(rep.id, rep.status)) #self.report_line("testreport %s: %s" %(rep.id, rep.status))
rep.node = node rep.node = node
self.config.hook.pytest_runtest_logreport(report=rep) self.config.hook.pytest_runtest_logreport(report=rep)