[Checkins] SVN: zc.selenium/trunk/src/zc/selenium/selenium.py Make sure we do not get errors when running either version of the

Stephan Richter srichter at cosmos.phy.tufts.edu
Wed Jun 4 07:21:09 EDT 2008


Log message for revision 87134:
  Make sure we do not get errors when running either version of the 
  server.
  

Changed:
  U   zc.selenium/trunk/src/zc/selenium/selenium.py

-=-
Modified: zc.selenium/trunk/src/zc/selenium/selenium.py
===================================================================
--- zc.selenium/trunk/src/zc/selenium/selenium.py	2008-06-03 22:57:04 UTC (rev 87133)
+++ zc.selenium/trunk/src/zc/selenium/selenium.py	2008-06-04 11:21:06 UTC (rev 87134)
@@ -39,8 +39,6 @@
 def run_zope(config, port):
     # This removes the script directory from sys.path, which we do
     # since there are no modules here.
-    #
-
     from zope.app.server.main import main
     main(["-C", config, "-X", "http0/address=" + port] + sys.argv[1:])
 
@@ -197,11 +195,12 @@
     if options.random_port:
         options.port = random_port()
 
+    runner = run_zope
     if options.wsgi_app:
-        run_zope = make_wsgi_run_zope(options.wsgi_app)
+        runner = make_wsgi_run_zope(options.wsgi_app)
 
     if options.server_only:
-        run_zope(options.config, port=options.port)
+        runner(options.config, port=options.port)
         sys.exit(0)
 
     if options.coverage:
@@ -212,7 +211,7 @@
         tracer.start()
 
     zope_thread = threading.Thread(
-        target=run_zope, args=(options.config, options.port))
+        target=runner, args=(options.config, options.port))
     zope_thread.setDaemon(True)
     zope_thread.start()
     test_result = run_tests(



More information about the Checkins mailing list