[Zodb-checkins] CVS: ZODB3/ZEO/tests - forker.py:1.21 winserver.py:1.10

[Guido van Rossum]

Update of /cvs-repository/ZODB3/ZEO/tests
In directory cvs.zope.org:/tmp/cvs-serv8723

Modified Files:
	forker.py winserver.py 
Log Message:
Fix the Windows version of the ro_svr code.

=== ZODB3/ZEO/tests/forker.py 1.20 => 1.21 ===
--- ZODB3/ZEO/tests/forker.py:1.20	Thu Sep 26 11:53:17 2002
+++ ZODB3/ZEO/tests/forker.py	Thu Sep 26 12:13:45 2002
@@ -64,10 +64,10 @@
         if script.endswith('.pyc'):
             script = script[:-1]
         if ro_svr:
-            args = (sys.executable, script, "-r")
+            prefix = (sys.executable, script, "-r")
         else:
-            args = (sys.executable, script)
-        args += (str(port), storage_name) + args
+            prefix = (sys.executable, script)
+        args = prefix + (str(port), storage_name) + args
         d = os.environ.copy()
         d['PYTHONPATH'] = os.pathsep.join(sys.path)
         pid = os.spawnve(os.P_NOWAIT, sys.executable, args, d)


=== ZODB3/ZEO/tests/winserver.py 1.9 => 1.10 ===
--- ZODB3/ZEO/tests/winserver.py:1.9	Thu Sep 26 11:53:17 2002
+++ ZODB3/ZEO/tests/winserver.py	Thu Sep 26 12:13:45 2002
@@ -55,7 +55,7 @@
     if args[0] == "-r":
         ro_svr = 1
         del args[0]
-    port, storage_name, rawargs = args
+    port, storage_name, rawargs = args[0], args[1], args[2:]
     klass = load_storage_class(storage_name)
     args = []
     for arg in rawargs:
@@ -66,7 +66,7 @@
     zeo_port = int(port)
     test_port = zeo_port + 1
     t = ZEOTestServer(('', test_port), storage)
-    addr = [('', zeo_port)]
+    addr = ('', zeo_port)
     serv = ZEO.StorageServer.StorageServer(addr, {'1': storage}, ro_svr)
     import zLOG
     label = "winserver:%d" % os.getpid()