[Zodb-checkins] CVS: StandaloneZODB/ZEO/tests - forker.py:1.10.4.4.2.6

[Jeremy Hylton]

Update of /cvs-repository/StandaloneZODB/ZEO/tests
In directory cvs.zope.org:/tmp/cvs-serv27497

Modified Files:
      Tag: ZEO2-branch
	forker.py 
Log Message:
Make args to start_zeo_server() consistent for Windows and Unix.


=== StandaloneZODB/ZEO/tests/forker.py 1.10.4.4.2.5 => 1.10.4.4.2.6 ===
 if os.name == "nt":
 
-    def start_zeo_server(storage_name, args, port=None):
+    def start_zeo_server(storage_name, args, addr=None):
         """Start a ZEO server in a separate process.
 
         Returns the ZEO port, the test server port, and the pid.
         """
         import ZEO.tests.winserver
-        if port is None:
+        if addr is None:
             port = get_port()
+        else:
+            port = addr[1]
         script = ZEO.tests.winserver.__file__
         if script.endswith('.pyc'):
             script = script[:-1]