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

adapt to pytest-2.2.0.dev2

Browse Source
This commit is contained in:
holger krekel
2011-11-08 17:54:26 +00:00
parent 1c2563d864
commit f946ab1835
8 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
testing/test_slavemanage.py
View File

@@ -135,7 +135,7 @@ class TestNodeManager:
@py.test.mark.xfail
def test_rsync_roots_no_roots(self, testdir, mysetup):
mysetup.source.ensure("dir1", "file1").write("hello")
config = testdir.reparseconfig([source])
config = testdir.parseconfig(source)
nodemanager = NodeManager(config, ["popen//chdir=%s" % mysetup.dest])
#assert nodemanager.config.topdir == source == config.topdir
nodemanager.makegateways()
@@ -179,7 +179,7 @@ class TestNodeManager:
[pytest]
rsyncdirs=dir1/dir2
"""))
config = testdir.reparseconfig([source])
config = testdir.parseconfig(source)
nodemanager = NodeManager(config, ["popen//chdir=%s" % dest])
nodemanager.makegateways()
nodemanager.rsync_roots()
@@ -198,7 +198,7 @@ class TestNodeManager:
rsyncdirs = dir1 dir5
rsyncignore = dir1/dir2 dir5/dir6
"""))
config = testdir.reparseconfig([source])
config = testdir.parseconfig(source)
nodemanager = NodeManager(config, ["popen//chdir=%s" % dest])
nodemanager.makegateways()
nodemanager.rsync_roots()
@@ -212,7 +212,7 @@ class TestNodeManager:
specs = ["popen"] * 3
source.join("conftest.py").write("rsyncdirs = ['a']")
source.ensure('a', dir=1)
config = testdir.reparseconfig([source])
config = testdir.parseconfig(source)
nodemanager = NodeManager(config, specs)
nodemanager.makegateways()
nodemanager.rsync_roots()