[svn] commit: r2522 - in /branches/trac277/src/bin/cmdctl: TODO cmdctl.py.in tests/cmdctl_test.py

[BIND 10 source code commits]

Author: jinmei
Date: Fri Jul 16 17:21:33 2010
New Revision: 2522

Log:
suggested changes:
 - exit non 0 code on failure
 - be clearer about additional tests in TODO
 - style: fold a long line in the test

Modified:
    branches/trac277/src/bin/cmdctl/TODO
    branches/trac277/src/bin/cmdctl/cmdctl.py.in
    branches/trac277/src/bin/cmdctl/tests/cmdctl_test.py

Modified: branches/trac277/src/bin/cmdctl/TODO
==============================================================================
--- branches/trac277/src/bin/cmdctl/TODO (original)
+++ branches/trac277/src/bin/cmdctl/TODO Fri Jul 16 17:21:33 2010
@@ -3,5 +3,5 @@
 . Add check for the content of key/certificate file
   (when cmdctl starts or is configured by bindctl).
 . Use only one msgq/session to communicate with other modules?
-. Add more test cases.
-
+. Add more test cases, especially about the cases where CmdctlException
+  is raised

Modified: branches/trac277/src/bin/cmdctl/cmdctl.py.in
==============================================================================
--- branches/trac277/src/bin/cmdctl/cmdctl.py.in (original)
+++ branches/trac277/src/bin/cmdctl/cmdctl.py.in Fri Jul 16 17:21:33 2010
@@ -595,8 +595,10 @@
     parser = OptionParser(version = __version__)
     set_cmd_options(parser)
     (options, args) = parser.parse_args()
+    result = 1                  # in case of failure
     try:
         run(options.addr, options.port, options.idle_timeout, options.verbose)
+        result = 0
     except isc.cc.SessionError as err:
         sys.stderr.write("[b10-cmdctl] Error creating b10-cmdctl, "
                          "is the command channel daemon running?\n")        
@@ -608,5 +610,4 @@
     if httpd:
         httpd.shutdown()
 
-
-
+    sys.exit(result)

Modified: branches/trac277/src/bin/cmdctl/tests/cmdctl_test.py
==============================================================================
--- branches/trac277/src/bin/cmdctl/tests/cmdctl_test.py (original)
+++ branches/trac277/src/bin/cmdctl/tests/cmdctl_test.py Fri Jul 16 17:21:33 2010
@@ -403,7 +403,8 @@
         except CmdctlException:
             pass
         else:
-            self.assertRaises(CmdctlException, SecureHTTPServer, ('localhost', 53531), 
+            self.assertRaises(CmdctlException, SecureHTTPServer,
+                              ('localhost', 53531),
                               MySecureHTTPRequestHandler, MyCommandControl)
         if server_one:
             server_one.server_close()