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

Fix rsync

Browse Source 
Since this now gets called multiple times per gateway we need to
ensure an rsync happens for each combination of (spec, root) otherwise
only the first root for a gateway will be rsynced.
This commit is contained in:
Floris Bruynooghe
2014-09-17 23:42:33 +01:00
parent 76c297bdb0
commit 9e28a56101
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xdist/slavemanage.py
View File

@@ -110,8 +110,6 @@ class NodeManager(object):
def rsync(self, gateway, source, notify=None, verbose=False, ignores=None): def rsync(self, gateway, source, notify=None, verbose=False, ignores=None):
"""Perform rsync to remote hosts for node.""" """Perform rsync to remote hosts for node."""
# XXX Probably want to keep a list of rsynced specs to avoid
# duplicate rsyncs.
# XXX This changes the calling behaviour of # XXX This changes the calling behaviour of
# pytest_xdist_rsyncstart and pytest_xdist_rsyncfinish to # pytest_xdist_rsyncstart and pytest_xdist_rsyncfinish to
# be called once per rsync target. # be called once per rsync target.
@@ -124,13 +122,13 @@ class NodeManager(object):
import sys ; sys.path.insert(0, %r) import sys ; sys.path.insert(0, %r)
""" % os.path.dirname(str(source))).waitclose() """ % os.path.dirname(str(source))).waitclose()
return return
if spec in self._rsynced_specs: if (spec, source) in self._rsynced_specs:
return return
def finished(): def finished():
if notify: if notify:
notify("rsyncrootready", spec, source) notify("rsyncrootready", spec, source)
rsync.add_target_host(gateway, finished=finished) rsync.add_target_host(gateway, finished=finished)
self._rsynced_specs.add(spec) self._rsynced_specs.add((spec, source))
self.config.hook.pytest_xdist_rsyncstart( self.config.hook.pytest_xdist_rsyncstart(
source=source, source=source,
gateways=[gateway], gateways=[gateway],