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

[fijal at codespeak.net]

Author: fijal
Date: Mon Jan  8 11:41:07 2007
New Revision: 36239

Modified:
   py/dist/py/test/rsession/rsession.py
Log:
Cleanup of Lsession.main


Modified: py/dist/py/test/rsession/rsession.py
==============================================================================
--- py/dist/py/test/rsession/rsession.py	(original)
+++ py/dist/py/test/rsession/rsession.py	Mon Jan  8 11:41:07 2007
@@ -256,20 +256,9 @@
         pkgdir = self.getpkgdir(args[0])
         colitems = self.make_colitems(args, baseon=pkgdir.dirpath())
         reporter(report.RsyncFinished())
-        
-        if runner is None and self.config.option.apigen:
-            from py.__.apigen.tracer.tracer import Tracer
-            module = py
-            try:
-                self.docstorage = self.config.getinitialvalue('ApiGen').get_doc_storage()
-            except (ValueError, AttributeError):
-                raise NotImplementedError("Need to provide conftest "
-                    "way of generating DocStorage")
-            self.tracer = Tracer(self.docstorage)
-            runner = apigen_runner
 
-        elif runner is None:
-            runner = RunnerPolicy[session_options.runner_policy]
+        if runner is None:
+            runner = self.init_runner()
 
         keyword = self.config.option.keyword
 
@@ -281,7 +270,11 @@
 
         if not self.config.option.nomagic:
             py.magic.revoke(assertion=1)
-        
+
+        self.write_docs()
+        return retval
+
+    def write_docs(self):
         if self.config.option.apigen:
             try:
                 apigen = self.config.getinitialvalue('ApiGen')
@@ -290,4 +283,18 @@
                     "provided way of doing that in conftest")
             else:
                 apigen.write_docs(self.docstorage)
-        return retval
+
+
+    def init_runner(self):
+        if self.config.option.apigen:
+            from py.__.apigen.tracer.tracer import Tracer
+            module = py
+            try:
+                self.docstorage = self.config.getinitialvalue('ApiGen').get_doc_storage()
+            except (ValueError, AttributeError):
+                raise NotImplementedError("Need to provide conftest "
+                    "way of generating DocStorage")
+            self.tracer = Tracer(self.docstorage)
+            return apigen_runner
+        else:
+            return RunnerPolicy[session_options.runner_policy]