[py-svn] r38102 - py/trunk/py/test/testing

[fijal at codespeak.net]

Author: fijal
Date: Wed Feb  7 19:56:48 2007
New Revision: 38102

Modified:
   py/trunk/py/test/testing/test_config.py
Log:
Skip this test not to interfere with py.test.config.boxed


Modified: py/trunk/py/test/testing/test_config.py
==============================================================================
--- py/trunk/py/test/testing/test_config.py	(original)
+++ py/trunk/py/test/testing/test_config.py	Wed Feb  7 19:56:48 2007
@@ -2,6 +2,7 @@
 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 @@
         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 = []