From c5df4c335c558ba2cd2f061e65f6e521bb272e42 Mon Sep 17 00:00:00 2001 From: fijal Date: Wed, 7 Feb 2007 19:56:48 +0100 Subject: [PATCH] [svn r38102] Skip this test not to interfere with py.test.config.boxed --HG-- branch : trunk --- py/test/testing/test_config.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/py/test/testing/test_config.py b/py/test/testing/test_config.py index 21d24eb50..2f362a8c5 100644 --- a/py/test/testing/test_config.py +++ b/py/test/testing/test_config.py @@ -2,6 +2,7 @@ from __future__ import generators import py from py.__.test.config import gettopdir +from py.__.test.testing.test_collect import skipboxed def test_tmpdir(): d1 = py.test.ensuretemp('hello') @@ -241,14 +242,15 @@ class TestSessionAndOptions: assert session.config is config def test_boxed_option_including_implied_from_conftest(self): + skipboxed() self.tmpdir.join("conftest.py").write("dist_hosts=[]") tmpdir = self.tmpdir.ensure("subdir", dir=1) config = py.test.config._reparse([tmpdir]) config.initsession() - assert not config.option.boxed + assert not config.option.boxed config = py.test.config._reparse(['--dist', tmpdir]) config.initsession() - assert not config.option.boxed + assert not config.option.boxed tmpdir.join("conftest.py").write(py.code.Source(""" dist_hosts = []