[py-svn] r36963 - in py/branch/config/py/test/rsession: . testing

[fijal at codespeak.net]

Author: fijal
Date: Thu Jan 18 19:21:43 2007
New Revision: 36963

Modified:
   py/branch/config/py/test/rsession/master.py
   py/branch/config/py/test/rsession/slave.py
   py/branch/config/py/test/rsession/testing/test_rsession.py
Log:
Fix remaining tests and make strange hack with parse/reparse.


Modified: py/branch/config/py/test/rsession/master.py
==============================================================================
--- py/branch/config/py/test/rsession/master.py	(original)
+++ py/branch/config/py/test/rsession/master.py	Thu Jan 18 19:21:43 2007
@@ -78,7 +78,7 @@
 def setup_slave(gateway, pkgpath, config):
     from py.__.test.rsession import slave
     import os
-    ch = gateway.remote_exec(str(py.code.Source(slave.setup, "setup()")))
+    ch = gateway.remote_exec(str(py.code.Source(slave.setup, "setup(True)")))
     #if hasattr(gateway, 'sshaddress'):
     #    assert not os.path.isabs(pkgpath)
     ch.send(str(pkgpath))

Modified: py/branch/config/py/test/rsession/slave.py
==============================================================================
--- py/branch/config/py/test/rsession/slave.py	(original)
+++ py/branch/config/py/test/rsession/slave.py	Thu Jan 18 19:21:43 2007
@@ -73,7 +73,7 @@
     while nextitem is not None:
         nextitem = receive()
     
-def setup():
+def setup(really_parse=False):
     def callback_gen(queue):
         from py.__.test.rsession.slave import Info
         def callback(item):
@@ -94,10 +94,14 @@
     # setup defaults...
     sys.path.insert(0, basedir)
     import py
-    config = py.test.config._reparse([])
-    config._overwrite('we_are_remote', True)
+    if really_parse:
+        py.test.config.parse([basedir])
+        config = py.test.config
+    else:
+        config = py.test.config._reparse([basedir])
     from py.__.test.rsession.rconfig import parse_repr
     parse_repr(config, config_repr)
+    config._overwrite('we_are_remote', True)
     from py.__.test.rsession.slave import Info
     Info.pid = 0
     # XXX the following assumes that py lib is there, a bit

Modified: py/branch/config/py/test/rsession/testing/test_rsession.py
==============================================================================
--- py/branch/config/py/test/rsession/testing/test_rsession.py	(original)
+++ py/branch/config/py/test/rsession/testing/test_rsession.py	Thu Jan 18 19:21:43 2007
@@ -226,6 +226,9 @@
         parse_directories(hosts)
         config = py.test.config._reparse([])
         config._overwrite('custom', 'custom')
+        # we need to overwrite default list to serialize
+        from py.__.test.rsession.rconfig import DEFAULT_LIST
+        DEFAULT_LIST.append("custom")
         nodes = init_hosts(allevents.append, hosts, pkgdir, 
             rsync_roots=["py"], config=config,
             optimise_localhost=False)
@@ -248,6 +251,7 @@
         assert len(passed) == 2 * len(nodes)
         assert len(skipped) == 0
         assert len(events) == len(passed)
+        DEFAULT_LIST.remove("custom")
     
     def test_nice_level(self):
         """ Tests if nice level behaviour is ok
@@ -257,14 +261,16 @@
         parse_directories(hosts)
         tmpdir = py.test.ensuretemp("nice")
         tmpdir.ensure("__init__.py")
-        tmpdir.ensure("conftest.py").write("""disthosts = ['localhost']""")
+        tmpdir.ensure("conftest.py").write(py.code.Source("""
+        disthosts = ['localhost']
+        dist_nicelevel = 10
+        """))
         tmpdir.ensure("test_one.py").write("""def test_nice():
             import os
             assert os.nice(0) == 10
         """)
         
         config = py.test.config._reparse([tmpdir])
-        config.option.nice_level = 10
         rsession = RSession(config)
         allevents = []
         rsession.main(reporter=allevents.append)