[trac588] update exception handling logic

src/bin/bindctl/bindcmd.py

@@ -117,19 +117,19 @@ class BindCmdInterpreter(Cmd):
         '''Parse commands from user and send them to cmdctl. '''
         try:
             if not self.login_to_cmdctl():
-                return 
+                return
 
             self.cmdloop()
+            print('\nExit from bindctl')
         except FailToLogin as err:
             # error already printed when this was raised, ignoring
             pass
         except KeyboardInterrupt:
             print('\nExit from bindctl')
         except socket.error as err:
-            if sys.stdin.isatty():
-                print("Socket error while sending request:", err)
-            else:
-                print('Exit from bindctl')
+            print('Fail to send request, the connection is closed')
+        except http.client.CannotSendRequest:
+            print('Can not send request, the connection is busy')
 
     def _get_saved_user_info(self, dir, file_name):
         ''' Read all the available username and password pairs saved in 
@@ -275,8 +275,9 @@ class BindCmdInterpreter(Cmd):
         self._update_commands()
 
     def precmd(self, line):
-        self._update_all_modules_info()
-        return line 
+        if line != 'EOF':
+            self._update_all_modules_info()
+        return line
 
     def postcmd(self, stop, line):
         '''Update the prompt after every command, but only if we

src/bin/bindctl/tests/bindctl_test.py

@@ -17,8 +17,10 @@
 import unittest
 import isc.cc.data
 import os
+import io
 import sys
 import socket
+import http.client
 from isc.config.config_data import ConfigData, MultiConfigData
 from isc.config.module_spec import ModuleSpec
 from bindctl import cmdparse
@@ -275,26 +277,68 @@ class FakeCCSession(MultiConfigData):
         self.set_specification(ModuleSpec(spec))
 
 
+# fake socket
+class FakeSocket():
+    def __init__(self):
+        self.run = True
+
+    def connect(self, to):
+        if not self.run:
+            raise socket.error
+
+    def close(self):
+        self.run = False
+
+    def send(self, data):
+        if not self.run:
+            raise socket.error
+        return len(data)
+
+    def makefile(self, type):
+        return self
+
+    def sendall(self, data):
+        if not self.run:
+            raise socket.error
+        return len(data)
+
+
 class TestConfigCommands(unittest.TestCase):
     def setUp(self):
         self.tool = bindcmd.BindCmdInterpreter()
         mod_info = ModuleInfo(name = "foo")
         self.tool.add_module_info(mod_info)
         self.tool.config_data = FakeCCSession()
+        self.stdout_backup = sys.stdout
 
     def test_run(self):
-        stdout_backup = sys.stdout
-        sys.stdout = open(os.devnull, 'w')
         def login_to_cmdctl():
             return True
-        def loop():
+        def cmd_loop():
             self.tool._send_message("/module_spec", None)
+
         self.tool.login_to_cmdctl = login_to_cmdctl
-        self.tool.cmdloop = loop
+        # rewrite cmdloop() to avoid interactive mode
+        self.tool.cmdloop = cmd_loop
 
+        self.tool.conn.sock = FakeSocket()
         self.tool.conn.close()
+
+        # validate log message for socket.err
+        socket_err_output = io.StringIO()
+        sys.stdout = socket_err_output
+        self.assertRaises(None, self.tool.run())
+        self.assertEqual("Fail to send request, the connection is closed\n",
+                         socket_err_output.getvalue())
+        socket_err_output.close()
+
+        # validate log messae for http.client.CannotSendRequest
+        cannot_send_output = io.StringIO()
+        sys.stdout = cannot_send_output
         self.assertRaises(None, self.tool.run())
-        sys.stdout = stdout_backup
+        self.assertEqual("Can not send request, the connection is busy\n",
+                         cannot_send_output.getvalue())
+        cannot_send_output.close()
 
     def test_apply_cfg_command_int(self):
         self.tool.location = '/'
@@ -344,10 +388,13 @@ class TestConfigCommands(unittest.TestCase):
         # this should raise a TypeError
         cmd = cmdparse.BindCmdParse("config set identifier=\"foo/a_list\" value=\"a\"")
         self.assertRaises(isc.cc.data.DataTypeError, self.tool.apply_config_cmd, cmd)
-        
+
         cmd = cmdparse.BindCmdParse("config set identifier=\"foo/a_list\" value=[1]")
         self.assertRaises(isc.cc.data.DataTypeError, self.tool.apply_config_cmd, cmd)
 
+    def tearDown(self):
+        sys.stdout = self.stdout_backup
+
 
 class FakeBindCmdInterpreter(bindcmd.BindCmdInterpreter):
     def __init__(self):
@@ -364,15 +411,18 @@ class TestBindCmdInterpreter(unittest.TestCase):
         csvfile.close()
 
     def test_get_saved_user_info(self):
+        old_stdout = sys.stdout
+        sys.stdout = open(os.devnull, 'w')
         cmd = FakeBindCmdInterpreter()
         users = cmd._get_saved_user_info('/notexist', 'cvs_file.cvs')
         self.assertEqual([], users)
-        
+
         csvfilename = 'csv_file.csv'
         self._create_invalid_csv_file(csvfilename)
         users = cmd._get_saved_user_info('./', csvfilename)
         self.assertEqual([], users)
         os.remove(csvfilename)
+        sys.stdout = old_stdout
 
 if __name__== "__main__":
     unittest.main()