Browse Source

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

Mukund Sivaraman 12 years ago
parent
commit
0f0c175daf
2 changed files with 0 additions and 22 deletions
  1. 0 2
      src/bin/bindctl/bindcmd.py
  2. 0 20
      src/bin/bindctl/tests/bindctl_test.py

+ 0 - 2
src/bin/bindctl/bindcmd.py

@@ -234,8 +234,6 @@ WARNING: Python readline module isn't available, so the command line editor
             return (response, data)
             return (response, data)
         except (ssl.SSLError, socket.error) as err:
         except (ssl.SSLError, socket.error) as err:
             self._print("Error while sending login information: ", 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.")
             pass
             pass
         raise FailToLogin()
         raise FailToLogin()
 
 

+ 0 - 20
src/bin/bindctl/tests/bindctl_test.py

@@ -388,10 +388,6 @@ class TestConfigCommands(unittest.TestCase):
             self.assertRaises(FailToLogin, self.tool._try_login, "foo", "bar")
             self.assertRaises(FailToLogin, self.tool._try_login, "foo", "bar")
             expected_printed_messages.append(
             expected_printed_messages.append(
                 'Error while sending login information:  test error')
                 '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.'
-            )
             self.__check_printed_messages(expected_printed_messages)
             self.__check_printed_messages(expected_printed_messages)
 
 
             def create_send_POST_raiseOnRead(exception):
             def create_send_POST_raiseOnRead(exception):
@@ -411,10 +407,6 @@ class TestConfigCommands(unittest.TestCase):
             self.assertRaises(FailToLogin, self.tool._try_login, "foo", "bar")
             self.assertRaises(FailToLogin, self.tool._try_login, "foo", "bar")
             expected_printed_messages.append(
             expected_printed_messages.append(
                 'Error while sending login information:  read error')
                 '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.'
-            )
             self.__check_printed_messages(expected_printed_messages)
             self.__check_printed_messages(expected_printed_messages)
 
 
             # connection reset
             # connection reset
@@ -425,10 +417,6 @@ class TestConfigCommands(unittest.TestCase):
             self.assertRaises(FailToLogin, self.tool._try_login, "foo", "bar")
             self.assertRaises(FailToLogin, self.tool._try_login, "foo", "bar")
             expected_printed_messages.append(
             expected_printed_messages.append(
                 'Error while sending login information:  connection reset')
                 '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.'
-            )
             self.__check_printed_messages(expected_printed_messages)
             self.__check_printed_messages(expected_printed_messages)
 
 
             # 'normal' SSL error
             # 'normal' SSL error
@@ -438,10 +426,6 @@ class TestConfigCommands(unittest.TestCase):
             self.assertRaises(FailToLogin, self.tool._try_login, "foo", "bar")
             self.assertRaises(FailToLogin, self.tool._try_login, "foo", "bar")
             expected_printed_messages.append(
             expected_printed_messages.append(
                 'Error while sending login information:  .*')
                 '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)
             self.__check_printed_messages(expected_printed_messages)
 
 
             # 'EOF' SSL error
             # 'EOF' SSL error
@@ -452,10 +436,6 @@ class TestConfigCommands(unittest.TestCase):
             self.assertRaises(FailToLogin, self.tool._try_login, "foo", "bar")
             self.assertRaises(FailToLogin, self.tool._try_login, "foo", "bar")
             expected_printed_messages.append(
             expected_printed_messages.append(
                 'Error while sending login information: .*')
                 '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)
             self.__check_printed_messages(expected_printed_messages)
 
 
             # any other exception should be passed through
             # any other exception should be passed through