Commit 083c1b16 authored by Likun Zhang's avatar Likun Zhang
Browse files

Fix the error in test cases of cmdctl, it should not depends on the installed file.

git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac127@2278 e5f2f494-b856-4b98-b285-d166d9295462
parent 77fcdf53
......@@ -279,7 +279,7 @@ class MyCommandControl(CommandControl):
return {}
def _setup_session(self):
module_spec = isc.config.module_spec_from_file(SPECFILE_LOCATION)
module_spec = isc.config.module_spec_from_file("../cmdctl.spec.pre.in")
config = isc.config.config_data.ConfigData(module_spec)
self._cmdctl_config_data = config.get_full_config()
......@@ -329,7 +329,9 @@ class TestCommandControl(unittest.TestCase):
self._check_answer(answer, 1, 'unknown command: unknown-command')
answer = self.cmdctl.command_handler('print_settings', None)
self._check_answer(answer, 0, None)
rcode, msg = ccsession.parse_answer(answer)
self.assertEqual(rcode, 0)
self.assertTrue(msg != None)
def test_check_config_handler(self):
answer = self.cmdctl.config_handler({'non-exist': 123})
......@@ -389,9 +391,15 @@ class TestSecureHTTPServer(unittest.TestCase):
def test_wrap_sock_in_ssl_context(self):
sock = socket.socket()
self.assertRaises(socket.error,
self.server._wrap_socket_in_ssl_context,
sock,
'../cmdctl-keyfile',
'../cmdctl-certfile')
self.server._wrap_socket_in_ssl_context(sock,
'../cmdctl-keyfile',
'../cmdctl-certfile')
'../cmdctl-keyfile.pem',
'../cmdctl-certfile.pem')
class TestFuncNotInClass(unittest.TestCase):
def test_check_port(self):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment