[py-svn] r34840 - in py/dist/py/test/rsession: . testing

[fijal at codespeak.net]

Author: fijal
Date: Tue Nov 21 21:25:39 2006
New Revision: 34840

Modified:
   py/dist/py/test/rsession/conftest.py
   py/dist/py/test/rsession/hostmanage.py
   py/dist/py/test/rsession/rsession.py
   py/dist/py/test/rsession/testing/test_boxing.py
   py/dist/py/test/rsession/testing/test_executor.py
Log:
Moved default waittime to session options


Modified: py/dist/py/test/rsession/conftest.py
==============================================================================
--- py/dist/py/test/rsession/conftest.py	(original)
+++ py/dist/py/test/rsession/conftest.py	Tue Nov 21 21:25:39 2006
@@ -1,14 +1,14 @@
-import py 
-Option = py.test.Config.Option 
+#import py 
+#Option = py.test.Config.Option 
 
-defaultwait = 100.0
+#defaultwait = 100.0
 
-option = py.test.Config.addoptions("distributed testing options", 
+#option = py.test.Config.addoptions("distributed testing options", 
 #        Option('-D', '--disthosts',
 #               action="store", dest="disthosts", default=None,
 #               help="comma separated list of testhosts"),
-        Option('', '--waittime',
-               action="store", dest="waittime", default=defaultwait, 
-               help="How long (in seconds) to wait for hanging nodes"
-               " (default=%s sec)" % defaultwait), 
-    )
+#        Option('', '--waittime',
+#               action="store", dest="waittime", default=defaultwait, 
+#               help="How long (in seconds) to wait for hanging nodes"
+#               " (default=%s sec)" % defaultwait), 
+#    )

Modified: py/dist/py/test/rsession/hostmanage.py
==============================================================================
--- py/dist/py/test/rsession/hostmanage.py	(original)
+++ py/dist/py/test/rsession/hostmanage.py	Tue Nov 21 21:25:39 2006
@@ -7,9 +7,6 @@
 from py.__.test.rsession import report 
 from py.__.test.rsession.rsync import RSync
 
-from py.__.test.rsession.conftest import option
-
-
 class HostRSync(RSync):
 
     def __init__(self, rsync_roots):
@@ -112,6 +109,8 @@
         exitfirst=False):
     for channel in channels:
         channel.send(None)
+    
+    from py.__.test.rsession.rsession import session_options
 
     clean = exitfirst
     while not clean:
@@ -124,7 +123,7 @@
 
     for channel in channels:
         try:
-            report.wrapcall(reporter, channel.waitclose, int(option.waittime))
+            report.wrapcall(reporter, channel.waitclose, int(session_options.waittime))
         except KeyboardInterrupt, SystemExit:
             raise
         except:

Modified: py/dist/py/test/rsession/rsession.py
==============================================================================
--- py/dist/py/test/rsession/rsession.py	(original)
+++ py/dist/py/test/rsession/rsession.py	Tue Nov 21 21:25:39 2006
@@ -37,6 +37,7 @@
         'max_tasks_per_node' : 15,
         'runner_policy' : 'plain_runner',
         'nice_level' : 0,
+        'waittime' : 100.0,
     }
     
     config = None

Modified: py/dist/py/test/rsession/testing/test_boxing.py
==============================================================================
--- py/dist/py/test/rsession/testing/test_boxing.py	(original)
+++ py/dist/py/test/rsession/testing/test_boxing.py	Tue Nov 21 21:25:39 2006
@@ -9,7 +9,6 @@
 
 from py.__.test.rsession.box import Box, RealBox, ScreenBox
 from py.__.test.rsession.testing import example2
-from py.__.test.rsession.conftest import option 
 
 def setup_module(mod):
     from py.__.test.rsession.rsession import remote_options

Modified: py/dist/py/test/rsession/testing/test_executor.py
==============================================================================
--- py/dist/py/test/rsession/testing/test_executor.py	(original)
+++ py/dist/py/test/rsession/testing/test_executor.py	Tue Nov 21 21:25:39 2006
@@ -6,7 +6,6 @@
 from py.__.test.rsession.outcome import ReprOutcome
 from py.__.test.rsession.testing.test_slave import funcprint_spec, \
     funcprintfail_spec
-from py.__.test.rsession.conftest import option 
 
 def setup_module(mod):
     mod.rootdir = py.path.local(py.__file__).dirpath().dirpath()