From 938680d50f27dd3290a162d86a14d81b080288a4 Mon Sep 17 00:00:00 2001
From: hpk <none@none>
Date: Wed, 7 Feb 2007 22:56:14 +0100
Subject: [PATCH] [svn r38125] run unboxed by default, split/improve tests for
 it

--HG--
branch : trunk
---
 py/test/rsession/rsession.py   |  1 -
 py/test/testing/test_config.py | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/py/test/rsession/rsession.py b/py/test/rsession/rsession.py
index 5ad2d184f..fd409ad5d 100644
--- a/py/test/rsession/rsession.py
+++ b/py/test/rsession/rsession.py
@@ -113,7 +113,6 @@ class RSession(AbstractSession):
             print "Cannot use nocapture with distributed testing"
             sys.exit(1)
         config = self.config
-        config.option.boxed = True
         try:
             config.getvalue('dist_hosts')
         except KeyError:
diff --git a/py/test/testing/test_config.py b/py/test/testing/test_config.py
index 7c4ba9267..275f57503 100644
--- a/py/test/testing/test_config.py
+++ b/py/test/testing/test_config.py
@@ -241,7 +241,7 @@ class TestSessionAndOptions:
         session = config.initsession()
         assert session.config is config 
 
-    def test_boxed_option_including_implied_from_conftest(self):
+    def test_boxed_option_default(self):
         self.tmpdir.join("conftest.py").write("dist_hosts=[]")
         tmpdir = self.tmpdir.ensure("subdir", dir=1)
         config = py.test.config._reparse([tmpdir])
@@ -249,8 +249,11 @@ class TestSessionAndOptions:
         assert not config.option.boxed
         config = py.test.config._reparse(['--dist', tmpdir])
         config.initsession()
-        assert config.option.boxed
+        assert not config.option.boxed
 
+    def test_boxed_option_from_conftest(self):
+        self.tmpdir.join("conftest.py").write("dist_hosts=[]")
+        tmpdir = self.tmpdir.ensure("subdir", dir=1)
         tmpdir.join("conftest.py").write(py.code.Source("""
             dist_hosts = []
             dist_boxed = True
@@ -258,6 +261,9 @@ class TestSessionAndOptions:
         config = py.test.config._reparse(['--dist', tmpdir])
         config.initsession()
         assert config.option.boxed 
+
+    def test_boxed_option_from_conftest2(self):
+        tmpdir = self.tmpdir
         tmpdir.join("conftest.py").write(py.code.Source("""
             dist_boxed = False
         """))
@@ -265,11 +271,9 @@ class TestSessionAndOptions:
         assert config.option.boxed 
         config.initsession()
         assert config.option.boxed
-        config = py.test.config._reparse([tmpdir, '-d'])
-        assert not config.option.boxed
-        config.initsession()
-        assert config.option.boxed
-        config = py.test.config._reparse([tmpdir, '-d', '-s'])
+
+    def test_dist_session_no_capturedisable(self):
+        config = py.test.config._reparse([self.tmpdir, '-d', '-s'])
         py.test.raises(SystemExit, "config.initsession()")
 
     def test_getvalue_pathlist(self):