[svn] commit: r2278 - /branches/trac127/src/bin/cmdctl/tests/cmdctl_test.py

[BIND 10 source code commits]

Author: zhanglikun
Date: Fri Jun 25 02:45:43 2010
New Revision: 2278

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

Modified:
    branches/trac127/src/bin/cmdctl/tests/cmdctl_test.py

Modified: branches/trac127/src/bin/cmdctl/tests/cmdctl_test.py
==============================================================================
--- branches/trac127/src/bin/cmdctl/tests/cmdctl_test.py (original)
+++ branches/trac127/src/bin/cmdctl/tests/cmdctl_test.py Fri Jun 25 02:45:43 2010
@@ -279,7 +279,7 @@
         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 @@
         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 @@
 
     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):