[py-svn] r33725 - py/dist/py/test/rsession

[fijal at codespeak.net]

Author: fijal
Date: Wed Oct 25 18:49:56 2006
New Revision: 33725

Modified:
   py/dist/py/test/rsession/local.py
   py/dist/py/test/rsession/rsession.py
Log:
Cleanup of runner, needs some tests.


Modified: py/dist/py/test/rsession/local.py
==============================================================================
--- py/dist/py/test/rsession/local.py	(original)
+++ py/dist/py/test/rsession/local.py	Wed Oct 25 18:49:56 2006
@@ -54,11 +54,12 @@
 #-4. benchmark_runner - for running with benchmarking
 #-5. apigen_runner - for running under apigen to generate api out of it.
 def local_loop(session, reporter, itemgenerator, shouldstop, config, runner=None):
-    if runner is None:
-        if session.config.option.apigen:
-            runner = apigen_runner
-        else:
-            runner = box_runner
+    assert runner is not None
+    #if runner is None:
+    #    if session.config.option.apigen:
+    #        runner = apigen_runner
+    #    else:
+    #    runner = box_runner
     while 1:
         try:
             item = itemgenerator.next()

Modified: py/dist/py/test/rsession/rsession.py
==============================================================================
--- py/dist/py/test/rsession/rsession.py	(original)
+++ py/dist/py/test/rsession/rsession.py	Wed Oct 25 18:49:56 2006
@@ -16,7 +16,8 @@
 from py.__.test.rsession.hostmanage import init_hosts, teardown_hosts
 
 from py.__.test.terminal.out import getout
-from py.__.test.rsession.local import local_loop, plain_runner
+from py.__.test.rsession.local import local_loop, plain_runner, apigen_runner,\
+    box_runner
 
 class RemoteOptions(object):
     def __init__(self, d):
@@ -458,7 +459,7 @@
         colitems = self.make_colitems(args, baseon=pkgdir.dirpath())
         reporter(report.RsyncFinished())
         
-        if self.config.option.apigen:
+        if runner is None and self.config.option.apigen:
             from py.__.apigen.tracer.docstorage import DocStorage
             from py.__.apigen.tracer.tracer import Tracer
             # XXX
@@ -466,6 +467,11 @@
             #module = __import__(str(pkgdir.join('__init__.py')))
             self.docstorage = DocStorage().from_pkg(module)
             self.tracer = Tracer(self.docstorage)
+            runner = apigen_runner
+        elif runner is None and (self.config.option.usepdb or self.config.option.nocapture):
+            runner = plain_runner
+        elif runner is None:
+            runner = box_runner
 
         keyword = self.config.option.keyword
 
@@ -478,8 +484,6 @@
         #assert 0, "\n".join([",".join(x.listnames()) for x in 
         #    list(itemgenerator)])
         # XXX: We have to decide which runner to use at this point
-        if runner is None and (self.config.option.usepdb or self.config.option.nocapture):
-            runner = plain_runner
         local_loop(self, reporter, itemgenerator, checkfun, self.config, runner=runner)
         
         reporter(report.TestFinished())