diff --git a/testing/test_slavemanage.py b/testing/test_slavemanage.py index 525f1a9..edf2abb 100644 --- a/testing/test_slavemanage.py +++ b/testing/test_slavemanage.py @@ -198,12 +198,14 @@ class TestNodeManager: dirf = source.ensure("dir5", "file") dir2.ensure("hello") dirfoo = source.ensure("foo", "bar") + dirbar = source.ensure("bar", "foo") source.join("tox.ini").write(py.std.textwrap.dedent(""" [pytest] rsyncdirs = dir1 dir5 rsyncignore = dir1/dir2 dir5/dir6 foo* """)) config = testdir.parseconfig(source) + config.option.rsyncignore = ['bar'] nodemanager = NodeManager(config, ["popen//chdir=%s" % dest]) nodemanager.makegateways() nodemanager.rsync_roots() @@ -212,6 +214,7 @@ class TestNodeManager: assert dest.join("dir5","file").check() assert not dest.join("dir6").check() assert not dest.join('foo').check() + assert not dest.join('bar').check() def test_optimise_popen(self, testdir, mysetup): source, dest = mysetup.source, mysetup.dest diff --git a/xdist/slavemanage.py b/xdist/slavemanage.py index ce55c23..23cabd9 100644 --- a/xdist/slavemanage.py +++ b/xdist/slavemanage.py @@ -102,7 +102,7 @@ class NodeManager(object): def _getrsyncoptions(self): """Get options to be passed for rsync.""" ignores = list(self.DEFAULT_IGNORES) - ignores = self.config.option.rsyncignore + ignores += self.config.option.rsyncignore ignores += self.config.getini("rsyncignore") return {