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

[Stefan H. Holek]

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

Modified Files:
      Tag: Zope-2_7-branch
	testzdrun.py 
Log Message:
Renamed run() method to _run() so tests work with Python 2.4's unittest module.


=== Packages/zdaemon/tests/testzdrun.py 1.5.16.5 => 1.5.16.6 ===
--- Packages/zdaemon/tests/testzdrun.py:1.5.16.5	Wed Jun  9 14:42:10 2004
+++ Packages/zdaemon/tests/testzdrun.py	Thu Mar 10 13:24:29 2005
@@ -90,7 +90,7 @@
         ##os.system("PYTHONPATH=%s %s %s -s %s %s &" %
         ##    (self.ppath, self.python, self.zdrun, self.zdsock, args))
 
-    def run(self, args):
+    def _run(self, args):
         if type(args) is type(""):
             args = args.split()
         try:
@@ -103,27 +103,27 @@
         self.expect = ""
 
 ##     def testInvoke(self):
-##         self.run("echo -n")
+##         self._run("echo -n")
 ##         self.expect = ""
 
 ##     def testControl(self):
 ##         self.rundaemon(["sleep", "1000"])
 ##         time.sleep(1)
-##         self.run("stop")
+##         self._run("stop")
 ##         time.sleep(1)
-##         self.run("exit")
+##         self._run("exit")
 ##         self.expect = "Sent SIGTERM\nExiting now\n"
 
 ##     def testStop(self):
 ##         self.rundaemon([self.python, self.nokill])
 ##         time.sleep(1)
-##         self.run("stop")
+##         self._run("stop")
 ##         time.sleep(1)
-##         self.run("exit")
+##         self._run("exit")
 ##         self.expect = "Sent SIGTERM\nSent SIGTERM; will exit later\n"
 
     def testHelp(self):
-        self.run("-h")
+        self._run("-h")
         import __main__
         self.expect = __main__.__doc__