summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMukund Sivaraman <muks@isc.org>2013-03-07 04:24:29 +0100
committerMukund Sivaraman <muks@isc.org>2013-03-07 04:24:29 +0100
commit0f0c175daf770bf863f32a4798657625704a0c54 (patch)
tree4949c5e521c2811a5c173a979cd6c53d70ed5dc6
parent[2641] Rename and fix CMDCTL_SRC_PATH usage (diff)
downloadkea-0f0c175daf770bf863f32a4798657625704a0c54.tar.xz
kea-0f0c175daf770bf863f32a4798657625704a0c54.zip
[2641] Removed message asking users to check b10-cmdctl logs
-rw-r--r--src/bin/bindctl/bindcmd.py2
-rw-r--r--src/bin/bindctl/tests/bindctl_test.py20
2 files changed, 0 insertions, 22 deletions
diff --git a/src/bin/bindctl/bindcmd.py b/src/bin/bindctl/bindcmd.py
index 3bc25cc6fe..53d52c3145 100644
--- a/src/bin/bindctl/bindcmd.py
+++ b/src/bin/bindctl/bindcmd.py
@@ -234,8 +234,6 @@ WARNING: Python readline module isn't available, so the command line editor
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.")
pass
raise FailToLogin()
diff --git a/src/bin/bindctl/tests/bindctl_test.py b/src/bin/bindctl/tests/bindctl_test.py
index 921a9f5186..665a277db8 100644
--- a/src/bin/bindctl/tests/bindctl_test.py
+++ b/src/bin/bindctl/tests/bindctl_test.py
@@ -388,10 +388,6 @@ class TestConfigCommands(unittest.TestCase):
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.'
- )
self.__check_printed_messages(expected_printed_messages)
def create_send_POST_raiseOnRead(exception):
@@ -411,10 +407,6 @@ class TestConfigCommands(unittest.TestCase):
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.'
- )
self.__check_printed_messages(expected_printed_messages)
# connection reset
@@ -425,10 +417,6 @@ class TestConfigCommands(unittest.TestCase):
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.'
- )
self.__check_printed_messages(expected_printed_messages)
# 'normal' SSL error
@@ -438,10 +426,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)
# '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