adapt to pytest-2.2.0.dev2

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

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