[svn] commit: r2302 - in /branches/trac127/src/bin/cmdctl/tests: Makefile.am cmdctl_test.py

[BIND 10 source code commits]

Author: zhanglikun
Date: Mon Jun 28 08:02:22 2010
New Revision: 2302

Log:
Fix file path error in cmdctl test code.

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

Modified: branches/trac127/src/bin/cmdctl/tests/Makefile.am
==============================================================================
--- branches/trac127/src/bin/cmdctl/tests/Makefile.am (original)
+++ branches/trac127/src/bin/cmdctl/tests/Makefile.am Mon Jun 28 08:02:22 2010
@@ -8,5 +8,6 @@
 	for pytest in $(PYTESTS) ; do \
 	echo Running test: $$pytest ; \
 	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/cmdctl \
+	CMDCTL_SPEC_PATH=$(abs_top_srcdir)/src/bin/cmdctl \
 	$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
 	done

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 Mon Jun 28 08:02:22 2010
@@ -18,6 +18,11 @@
 import socket
 import tempfile
 from cmdctl import *
+
+if 'CMDCTL_SPEC_PATH' in os.environ:
+    FILE_PATH = os.environ['CMDCTL_SPEC_PATH'] + os.sep
+else:
+    FILE_PATH = '..' + os.sep
 
 # Rewrite the class for unittest.
 class MySecureHTTPRequestHandler(SecureHTTPRequestHandler):
@@ -279,7 +284,8 @@
         return {}
 
     def _setup_session(self):
-        module_spec = isc.config.module_spec_from_file("../cmdctl.spec.pre.in")
+        spec_file = FILE_PATH + 'cmdctl.spec'
+        module_spec = isc.config.module_spec_from_file(spec_file)
         config = isc.config.config_data.ConfigData(module_spec)
         self._cmdctl_config_data = config.get_full_config()
 
@@ -385,7 +391,7 @@
         self.server._create_user_info('/local/not-exist')
         self.assertEqual(0, len(self.server._user_infos))
 
-        self.server._create_user_info('../cmdctl-accounts.csv')
+        self.server._create_user_info(FILE_PATH + 'cmdctl-accounts.csv')
         self.assertEqual(1, len(self.server._user_infos))
         self.assertTrue('root' in self.server._user_infos)
 
@@ -398,8 +404,8 @@
                           '../cmdctl-certfile')
 
         self.server._wrap_socket_in_ssl_context(sock, 
-                          '../cmdctl-keyfile.pem',
-                          '../cmdctl-certfile.pem')
+                          FILE_PATH + 'cmdctl-keyfile.pem',
+                          FILE_PATH + 'cmdctl-certfile.pem')
 
 class TestFuncNotInClass(unittest.TestCase):
     def test_check_port(self):