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

6
testing/test_boxed.py
View File

@@ -16,13 +16,13 @@ def test_functional_boxed(testdir):
class TestOptionEffects:
def test_boxed_option_default(self, testdir):
tmpdir = testdir.tmpdir.ensure("subdir", dir=1)
config = testdir.reparseconfig()
config = testdir.parseconfig()
assert not config.option.boxed
py.test.importorskip("execnet")
config = testdir.reparseconfig(['-d', tmpdir])
config = testdir.parseconfig('-d', tmpdir)
assert not config.option.boxed
def test_is_not_boxed_by_default(self, testdir):
config = testdir.reparseconfig([testdir.tmpdir])
config = testdir.parseconfig(testdir.tmpdir)
assert not config.option.boxed

18
testing/test_remote.py
View File

@@ -80,7 +80,7 @@ class TestReportSerialization:
py.test.xfail("hello")
""")
reports = reprec.getreports("pytest_runtest_logreport")
assert len(reports) == 6
assert len(reports) == 17 # with setup/teardown "passed" reports
for rep in reports:
d = serialize_report(rep)
check_marshallable(d)
@@ -138,6 +138,7 @@ class TestSlaveInteractor:
ids = ev.kwargs['ids']
assert len(ids) == 1
slave.sendcommand("runtests", ids=ids)
ev = slave.popevent("testreport") # setup
ev = slave.popevent("testreport")
assert ev.name == "testreport"
rep = unserialize_report(ev.name, ev.kwargs['data'])
@@ -194,15 +195,12 @@ class TestSlaveInteractor:
ids = ev.kwargs['ids']
assert len(ids) == 2
slave.sendcommand("runtests_all", )
ev = slave.popevent("testreport")
assert ev.name == "testreport"
rep = unserialize_report(ev.name, ev.kwargs['data'])
assert rep.nodeid.endswith("::test_func")
ev = slave.popevent("testreport")
assert ev.name == "testreport"
rep = unserialize_report(ev.name, ev.kwargs['data'])
assert rep.nodeid.endswith("::test_func2")
assert rep.passed
for func in "::test_func", "::test_func2":
for i in range(3): # setup/call/teardown
ev = slave.popevent("testreport")
assert ev.name == "testreport"
rep = unserialize_report(ev.name, ev.kwargs['data'])
assert rep.nodeid.endswith(func)
slave.sendcommand("shutdown")
ev = slave.popevent("slavefinished")
assert 'slaveoutput' in ev.kwargs

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()