[Zodb-checkins] CVS: Packages/zdaemon/tests - testzdrun.py:1.5.16.7

[Tres Seaver]

Update of /cvs-repository/Packages/zdaemon/tests
In directory cvs.zope.org:/tmp/cvs-serv13434/lib/python/zdaemon/tests

Modified Files:
      Tag: Zope-2_7-branch
	testzdrun.py 
Log Message:


 - Renamed utility methods in zdaemon/tests/test_zdrun.py to avoid
   a clash with unittest.TestCaes methods (the clash surfaced only
   under Python 2.4.1c1, due to subtle changes in MRO behavior).



=== Packages/zdaemon/tests/testzdrun.py 1.5.16.6 => 1.5.16.7 ===
--- Packages/zdaemon/tests/testzdrun.py:1.5.16.6	Thu Mar 10 13:24:29 2005
+++ Packages/zdaemon/tests/testzdrun.py	Thu Mar 10 15:42:09 2005
@@ -80,7 +80,7 @@
                 args[i] = '"%s"' % args[i]
         return " ".join(args)
 
-    def rundaemon(self, args):
+    def _rundaemon(self, args):
         # Add quotes, in case some pathname contains spaces (e.g. Mac OS X)
         args = self.quoteargs(args)
         cmd = ('PYTHONPATH="%s" "%s" "%s" -d -s "%s" %s' %
@@ -99,7 +99,7 @@
             pass
 
     def testSystem(self):
-        self.rundaemon(["echo", "-n"])
+        self._rundaemon(["echo", "-n"])
         self.expect = ""
 
 ##     def testInvoke(self):
@@ -107,7 +107,7 @@
 ##         self.expect = ""
 
 ##     def testControl(self):
-##         self.rundaemon(["sleep", "1000"])
+##         self._rundaemon(["sleep", "1000"])
 ##         time.sleep(1)
 ##         self._run("stop")
 ##         time.sleep(1)
@@ -115,7 +115,7 @@
 ##         self.expect = "Sent SIGTERM\nExiting now\n"
 
 ##     def testStop(self):
-##         self.rundaemon([self.python, self.nokill])
+##         self._rundaemon([self.python, self.nokill])
 ##         time.sleep(1)
 ##         self._run("stop")
 ##         time.sleep(1)