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

[fijal at codespeak.net]

Author: fijal
Date: Tue Dec  5 13:09:09 2006
New Revision: 35289

Modified:
   py/dist/py/test/rsession/rsession.py
   py/dist/py/test/rsession/web.py
Log:
Added session option to ensure pypy will be imported. Samuele suggestion.


Modified: py/dist/py/test/rsession/rsession.py
==============================================================================
--- py/dist/py/test/rsession/rsession.py	(original)
+++ py/dist/py/test/rsession/rsession.py	Tue Dec  5 13:09:09 2006
@@ -38,6 +38,7 @@
         'runner_policy' : 'plain_runner',
         'nice_level' : 0,
         'waittime' : 100.0,
+        'import_pypy' : False,
     }
     
     config = None
@@ -178,6 +179,7 @@
         except:
             rsync_roots = None    # all files and directories in the pkgdir
         
+        session_options.bind_config(self.config)
         reporter, checkfun, startserverflag = self.init_reporter(reporter,
             sshhosts, RemoteReporter)
         reporter(report.TestStarted(sshhosts))
@@ -188,7 +190,6 @@
         except:
             remotepython = None
 
-        session_options.bind_config(self.config)
         nodes = init_hosts(reporter, sshhosts, directories, pkgdir,
             rsync_roots, remotepython, remote_options=remote_options.d,
             optimise_localhost=self.optimise_localhost)
@@ -225,6 +226,7 @@
         if not self.config.option.nomagic:
             py.magic.invoke(assertion=1)
 
+        session_options.bind_config(self.config)
         reporter, checkfun, startserverflag = self.init_reporter(reporter, 
             sshhosts, LocalReporter, args[0])
         if shouldstop:
@@ -234,7 +236,6 @@
         pkgdir = self.getpkgdir(args[0])
         colitems = self.make_colitems(args, baseon=pkgdir.dirpath())
         reporter(report.RsyncFinished())
-        session_options.bind_config(self.config)
         
         if runner is None and self.config.option.apigen:
             from py.__.apigen.tracer.tracer import Tracer

Modified: py/dist/py/test/rsession/web.py
==============================================================================
--- py/dist/py/test/rsession/web.py	(original)
+++ py/dist/py/test/rsession/web.py	Tue Dec  5 13:09:09 2006
@@ -13,7 +13,7 @@
 import sys
 
 import py
-from py.__.test.rsession.rsession import RSession
+from py.__.test.rsession.rsession import RSession, session_options
 from py.__.test.rsession import report
 from py.__.test import collect
 
@@ -29,6 +29,8 @@
     #    replace("'", "\\'").replace(" ", "&nbsp;").replace("\n", "<br/>")
 
 try:
+    if not session_options.import_pypy:
+        raise ImportError
     from pypy.rpython.ootypesystem.bltregistry import MethodDesc, BasicExternal,\
                                                       described
     from pypy.translator.js.main import rpython2javascript, Options