[Python-checkins] r77331 - python/trunk/Lib/test/test_cmd.py

[georg.brandl]

Author: georg.brandl
Date: Wed Jan  6 18:43:06 2010
New Revision: 77331

Log:
Small fixes to test_cmd: fix signature of do_shell, remove duplicate import, add option to run the custom Cmd class.

Modified:
   python/trunk/Lib/test/test_cmd.py

Modified: python/trunk/Lib/test/test_cmd.py
==============================================================================
--- python/trunk/Lib/test/test_cmd.py	(original)
+++ python/trunk/Lib/test/test_cmd.py	Wed Jan  6 18:43:06 2010
@@ -143,7 +143,7 @@
         print "complete command"
         return
 
-    def do_shell(self):
+    def do_shell(self, s):
         pass
 
     def do_add(self, s):
@@ -169,8 +169,8 @@
     from test import test_support, test_cmd
     test_support.run_doctest(test_cmd, verbose)
 
-import trace, sys
 def test_coverage(coverdir):
+    import trace
     tracer=trace.Trace(ignoredirs=[sys.prefix, sys.exec_prefix,],
                         trace=0, count=1)
     tracer.run('reload(cmd);test_main()')
@@ -181,5 +181,7 @@
 if __name__ == "__main__":
     if "-c" in sys.argv:
         test_coverage('/tmp/cmd.cover')
+    elif "-i" in sys.argv:
+        samplecmdclass().cmdloop()
     else:
         test_main()