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

[fijal at codespeak.net]

Author: fijal
Date: Thu Jan 18 19:35:00 2007
New Revision: 36965

Modified:
   py/branch/config/py/test/rsession/master.py
   py/branch/config/py/test/rsession/testing/test_rsession.py
Log:
Fix the test.


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:35:00 2007
@@ -81,7 +81,7 @@
     #if hasattr(gateway, 'sshaddress'):
     #    assert not os.path.isabs(pkgpath)
     ch.send(str(pkgpath))
-    ch.send(config.make_repr(conftestnames=defaultconftestnames))
+    ch.send(config.make_repr(defaultconftestnames))
     return ch
 
 defaultconftestnames = ['dist_nicelevel']

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:35:00 2007
@@ -227,8 +227,8 @@
         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")
+        from py.__.test.rsession.master import defaultconftestnames
+        defaultconftestnames.append("custom")
         nodes = init_hosts(allevents.append, hosts, pkgdir, 
             rsync_roots=["py"], config=config,
             optimise_localhost=False)
@@ -251,7 +251,7 @@
         assert len(passed) == 2 * len(nodes)
         assert len(skipped) == 0
         assert len(events) == len(passed)
-        DEFAULT_LIST.remove("custom")
+        defaultconftestnames.remove("custom")
     
     def test_nice_level(self):
         """ Tests if nice level behaviour is ok