[Zodb-checkins] CVS: ZEO/ZEO/tests - forker.py:1.10.4.4.2.5 testZEO.py:1.16.4.4.2.9

[Jeremy Hylton]

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

Modified Files:
      Tag: ZEO2-branch
	forker.py testZEO.py 
Log Message:
Try to make consistent use of the start_zeo_server() call on Windows.


=== ZEO/ZEO/tests/forker.py 1.10.4.4.2.4 => 1.10.4.4.2.5 ===
         if script.endswith('.pyc'):
             script = script[:-1]
-        args = (sys.executable, script, str(port), storage_name) + args[0]
+        args = (sys.executable, script, 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)


=== ZEO/ZEO/tests/testZEO.py 1.16.4.4.2.8 => 1.16.4.4.2.9 ===
         args = self.getStorageInfo()
         name = args[0]
-        args = args[1:]
+        args = args[1]
         zeo_addr, self.test_addr, self.test_pid = \
                   forker.start_zeo_server(name, args)
-        storage = ZEO.ClientStorage.ClientStorage(zeo_addr, wait=1,#debug=1,
+        storage = ZEO.ClientStorage.ClientStorage(zeo_addr, wait=1,
                                                   min_disconnect_poll=0.1)
         self._storage = PackWaitWrapper(storage)
         storage.registerDB(DummyDB(), None)