[svn] commit: r1882 - in /branches/trac185/src/bin/xfrin: tests/xfrin_test.py xfrin.py.in

[BIND 10 source code commits]

Author: jinmei
Date: Thu May 20 22:32:43 2010
New Revision: 1882

Log:
catch unknown command in Xfrin.command_handler().

Modified:
    branches/trac185/src/bin/xfrin/tests/xfrin_test.py
    branches/trac185/src/bin/xfrin/xfrin.py.in

Modified: branches/trac185/src/bin/xfrin/tests/xfrin_test.py
==============================================================================
--- branches/trac185/src/bin/xfrin/tests/xfrin_test.py (original)
+++ branches/trac185/src/bin/xfrin/tests/xfrin_test.py Thu May 20 22:32:43 2010
@@ -444,9 +444,6 @@
         self.assertEqual(self.xfr.command_handler("shutdown",
                                                   "unused")['result'][0], 0)
 
-        self.assertEqual(self.xfr.command_handler("Shutdown",
-                                                  "unused")['result'][0], 0)
-
     def test_command_handler_retransfer(self):
         self.assertEqual(self.xfr.command_handler("retransfer",
                                                   self.args)['result'][0], 0)
@@ -488,6 +485,9 @@
         self.assertEqual(self.xfr.command_handler("refresh",
                                                   self.args)['result'][0], 0)
 
+    def test_command_handler_unknown(self):
+        self.assertEqual(self.xfr.command_handler("xxx", None)['result'][0], 1)
+
 def raise_interrupt():
     raise KeyboardInterrupt()
 

Modified: branches/trac185/src/bin/xfrin/xfrin.py.in
==============================================================================
--- branches/trac185/src/bin/xfrin/xfrin.py.in (original)
+++ branches/trac185/src/bin/xfrin/xfrin.py.in Thu May 20 22:32:43 2010
@@ -400,16 +400,16 @@
 
     def command_handler(self, command, args):
         answer = create_answer(0)
-        cmd = command
         try:
-            if cmd == 'shutdown':
+            if command == 'shutdown':
                 self._shutdown_event.set()
-
-            elif cmd == 'retransfer' or cmd == 'refresh':
+            elif command == 'retransfer' or command == 'refresh':
                 zone_name, master_addr, db_file = self._parse_cmd_params(args)
                 ret = self.xfrin_start(zone_name, db_file, master_addr,
-                                       False if cmd == 'retransfer' else True)
+                                   False if command == 'retransfer' else True)
                 answer = create_answer(ret[0], ret[1])
+            else:
+                answer = create_answer(1, 'unknown command: ' + command)
 
         except XfrinException as err:
             answer = create_answer(1, str(err))