[Zodb-checkins] CVS: Zope/lib/python/ZEO/tests - testStart.py:1.12.4.2

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/ZEO/tests
In directory cvs.zope.org:/tmp/cvs-serv31373/lib/python/ZEO/tests

Modified Files:
      Tag: chrism-install-branch
	testStart.py 
Log Message:
Merge with HEAD.  Again, sorry for the spew (what's left of it... someone seems to have filtered some of this branch's checkins out).


=== Zope/lib/python/ZEO/tests/testStart.py 1.12.4.1 => 1.12.4.2 ===
--- Zope/lib/python/ZEO/tests/testStart.py:1.12.4.1	Tue Oct  8 20:41:42 2002
+++ Zope/lib/python/ZEO/tests/testStart.py	Sat Oct 26 15:51:49 2002
@@ -65,14 +65,11 @@
     def getpids(self):
         if not os.path.exists(self.env.zeo_pid):
             # If there's no pid file, assume the server isn't running
-            return None, None
+            return []
         return map(int, open(self.env.zeo_pid).read().split())
 
     def stop_server(self):
-        ppid, pid = self.getpids()
-        if ppid is None:
-            return
-        self.kill(pids=[pid])
+        self.kill(pids=self.getpids())
 
     def kill(self, sig=signal.SIGTERM, pids=None):
         if pids is None:
@@ -141,7 +138,7 @@
         cs = ClientStorage(('', port), wait=wait)
         cs.close()
 
-    def testNoPort(self):
+    def testErrNoPort(self):
         outp = self.system("-s")
         self.assert_(outp.find("No port specified") != -1)
 
@@ -172,9 +169,7 @@
                     break
             self.assert_(buf1)
             os.rename(logfile1, logfile2)
-            ppid, pid = self.getpids()
-    ##        os.kill(ppid, signal.SIGHUP)
-            os.kill(pid, signal.SIGHUP)
+            self.kill(signal.SIGUSR2, pids=self.getpids())
             self.connect(port=port)
             buf2 = open(logfile1).read()
             self.assert_(buf2)