Merge branch 'trac588' of ssh://bind10.isc.org/var/bind10/git/bind10 into trac588

src/bin/bindctl/bindcmd.py

@@ -127,7 +127,7 @@ class BindCmdInterpreter(Cmd):
         except KeyboardInterrupt:
             print('\nExit from bindctl')
         except socket.error as err:
-            print('Fail to send request, the connection is closed')
+            print('Failed to send request, the connection is closed')
         except http.client.CannotSendRequest:
             print('Can not send request, the connection is busy')
 

src/bin/bindctl/tests/bindctl_test.py

@@ -338,11 +338,11 @@ class TestConfigCommands(unittest.TestCase):
         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",
+        self.assertEqual("Failed to send request, the connection is closed\n",
                          socket_err_output.getvalue())
         socket_err_output.close()
 
-        # validate log messae for http.client.CannotSendRequest
+        # validate log message for http.client.CannotSendRequest
         cannot_send_output = io.StringIO()
         sys.stdout = cannot_send_output
         self.assertRaises(None, self.tool.run())