[Zope-Checkins] CVS: ZODB3/zdaemon/tests - testzdaemon.py:1.6
Guido van Rossum
guido@python.org
Thu, 21 Nov 2002 17:25:37 -0500
Update of /cvs-repository/ZODB3/zdaemon/tests
In directory cvs.zope.org:/tmp/cvs-serv25340/tests
Modified Files:
testzdaemon.py
Log Message:
Rename opts to options.
=== ZODB3/zdaemon/tests/testzdaemon.py 1.5 => 1.6 ===
--- ZODB3/zdaemon/tests/testzdaemon.py:1.5 Wed Nov 13 17:39:38 2002
+++ ZODB3/zdaemon/tests/testzdaemon.py Thu Nov 21 17:25:36 2002
@@ -97,20 +97,20 @@
save_sys_argv = sys.argv
try:
sys.argv = ["A", "-c", "B", "C"]
- opts = zdaemon.Options()
+ options = zdaemon.Options()
finally:
sys.argv = save_sys_argv
- self.assertEqual(opts.opts, [("-c", "")])
- self.assertEqual(opts.isclient, 1)
- self.assertEqual(opts.args, ["B", "C"])
+ self.assertEqual(options.options, [("-c", "")])
+ self.assertEqual(options.isclient, 1)
+ self.assertEqual(options.args, ["B", "C"])
def testOptionsBasic(self):
# Check basic option parsing
- opts = zdaemon.Options(["-c", "B", "C"], "foo")
- self.assertEqual(opts.opts, [("-c", "")])
- self.assertEqual(opts.isclient, 1)
- self.assertEqual(opts.args, ["B", "C"])
- self.assertEqual(opts.progname, "foo")
+ options = zdaemon.Options(["-c", "B", "C"], "foo")
+ self.assertEqual(options.options, [("-c", "")])
+ self.assertEqual(options.isclient, 1)
+ self.assertEqual(options.args, ["B", "C"])
+ self.assertEqual(options.progname, "foo")
def testOptionsHelp(self):
# Check that -h behaves properly
@@ -138,8 +138,8 @@
def testSubprocessBasic(self):
# Check basic subprocess management: spawn, kill, wait
- opts = zdaemon.Options([])
- proc = zdaemon.Subprocess(opts, ["sleep", "100"])
+ options = zdaemon.Options([])
+ proc = zdaemon.Subprocess(options, ["sleep", "100"])
self.assertEqual(proc.pid, 0)
pid = proc.spawn()
self.assertEqual(proc.pid, pid)