BIND 10 trac2641_3, updated. 85a61f11135e898164d5e41e949bb6ba6929531b [2641] Remove duplicate space from messages

[BIND 10 source code commits]

The branch, trac2641_3 has been updated
       via  85a61f11135e898164d5e41e949bb6ba6929531b (commit)
       via  0f0c175daf770bf863f32a4798657625704a0c54 (commit)
      from  99fbbc37fe2c3e465af2e1e5990b89602b02e8d4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 85a61f11135e898164d5e41e949bb6ba6929531b
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu Mar 7 08:55:54 2013 +0530

    [2641] Remove duplicate space from messages

commit 0f0c175daf770bf863f32a4798657625704a0c54
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu Mar 7 08:54:29 2013 +0530

    [2641] Removed message asking users to check b10-cmdctl logs

-----------------------------------------------------------------------

Summary of changes:
 src/bin/bindctl/bindcmd.py            |    4 +---
 src/bin/bindctl/tests/bindctl_test.py |   28 ++++------------------------
 2 files changed, 5 insertions(+), 27 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/bindctl/bindcmd.py b/src/bin/bindctl/bindcmd.py
index 3bc25cc..5ae82a2 100644
--- a/src/bin/bindctl/bindcmd.py
+++ b/src/bin/bindctl/bindcmd.py
@@ -233,9 +233,7 @@ WARNING: Python readline module isn't available, so the command line editor
             # return here (will raise error after try block)
             return (response, data)
         except (ssl.SSLError, socket.error) as err:
-            self._print("Error while sending login information: ", err)
-            self._print("Please check the logs of b10-cmdctl, there may "
-                        "have been a problem accepting SSL connections.")
+            self._print('Error while sending login information:', err)
             pass
         raise FailToLogin()
 
diff --git a/src/bin/bindctl/tests/bindctl_test.py b/src/bin/bindctl/tests/bindctl_test.py
index 921a9f5..c3262e1 100644
--- a/src/bin/bindctl/tests/bindctl_test.py
+++ b/src/bin/bindctl/tests/bindctl_test.py
@@ -387,11 +387,7 @@ class TestConfigCommands(unittest.TestCase):
             self.tool.send_POST = send_POST_raiseImmediately
             self.assertRaises(FailToLogin, self.tool._try_login, "foo", "bar")
             expected_printed_messages.append(
-                'Error while sending login information:  test error')
-            expected_printed_messages.append(
-                'Please check the logs of b10-cmdctl, there may have been a '
-                'problem accepting SSL connections.'
-            )
+                'Error while sending login information: test error')
             self.__check_printed_messages(expected_printed_messages)
 
             def create_send_POST_raiseOnRead(exception):
@@ -410,11 +406,7 @@ class TestConfigCommands(unittest.TestCase):
                 create_send_POST_raiseOnRead(socket.error("read error"))
             self.assertRaises(FailToLogin, self.tool._try_login, "foo", "bar")
             expected_printed_messages.append(
-                'Error while sending login information:  read error')
-            expected_printed_messages.append(
-                'Please check the logs of b10-cmdctl, there may have been a '
-                'problem accepting SSL connections.'
-            )
+                'Error while sending login information: read error')
             self.__check_printed_messages(expected_printed_messages)
 
             # connection reset
@@ -424,11 +416,7 @@ class TestConfigCommands(unittest.TestCase):
                 create_send_POST_raiseOnRead(exc)
             self.assertRaises(FailToLogin, self.tool._try_login, "foo", "bar")
             expected_printed_messages.append(
-                'Error while sending login information:  connection reset')
-            expected_printed_messages.append(
-                'Please check the logs of b10-cmdctl, there may have been a '
-                'problem accepting SSL connections.'
-            )
+                'Error while sending login information: connection reset')
             self.__check_printed_messages(expected_printed_messages)
 
             # 'normal' SSL error
@@ -437,11 +425,7 @@ class TestConfigCommands(unittest.TestCase):
                 create_send_POST_raiseOnRead(exc)
             self.assertRaises(FailToLogin, self.tool._try_login, "foo", "bar")
             expected_printed_messages.append(
-                'Error while sending login information:  .*')
-            expected_printed_messages.append(
-                'Please check the logs of b10-cmdctl, there may have been a '
-                'problem accepting SSL connections.'
-            )
+                'Error while sending login information: .*')
             self.__check_printed_messages(expected_printed_messages)
 
             # 'EOF' SSL error
@@ -452,10 +436,6 @@ class TestConfigCommands(unittest.TestCase):
             self.assertRaises(FailToLogin, self.tool._try_login, "foo", "bar")
             expected_printed_messages.append(
                 'Error while sending login information: .*')
-            expected_printed_messages.append(
-                'Please check the logs of b10-cmdctl, there may have been a '
-                'problem accepting SSL connections.'
-            )
             self.__check_printed_messages(expected_printed_messages)
 
             # any other exception should be passed through