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

[BIND 10 source code commits]

Author: zhanglikun
Date: Tue Jun 29 03:49:32 2010
New Revision: 2321

Log:
use 'abs_top_builddir' instead of 'abs_top_srcdir' to get file cmdctl.spec

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 Tue Jun 29 03:49:32 2010
@@ -8,6 +8,7 @@
 	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 \
+	CMDCTL_SPEC_PATH=$(abs_top_builddir)/src/bin/cmdctl \
+	CMDCTL_SRC_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 Tue Jun 29 03:49:32 2010
@@ -19,10 +19,13 @@
 import tempfile
 from cmdctl import *
 
+SPEC_FILE_PATH = '..' + os.sep
 if 'CMDCTL_SPEC_PATH' in os.environ:
-    FILE_PATH = os.environ['CMDCTL_SPEC_PATH'] + os.sep
-else:
-    FILE_PATH = '..' + os.sep
+    SPEC_FILE_PATH = os.environ['CMDCTL_SPEC_PATH'] + os.sep
+
+SRC_FILE_PATH = '..' + os.sep
+if 'CMDCTL_SRC_PATH' in os.environ:
+    SRC_FILE_PATH = os.environ['CMDCTL_SRC_PATH'] + os.sep
 
 # Rewrite the class for unittest.
 class MySecureHTTPRequestHandler(SecureHTTPRequestHandler):
@@ -284,7 +287,7 @@
         return {}
 
     def _setup_session(self):
-        spec_file = FILE_PATH + 'cmdctl.spec'
+        spec_file = SPEC_FILE_PATH + 'cmdctl.spec'
         module_spec = isc.config.module_spec_from_file(spec_file)
         config = isc.config.config_data.ConfigData(module_spec)
         self._module_name = 'Cmdctl'
@@ -392,7 +395,7 @@
         self.server._create_user_info('/local/not-exist')
         self.assertEqual(0, len(self.server._user_infos))
 
-        self.server._create_user_info(FILE_PATH + 'cmdctl-accounts.csv')
+        self.server._create_user_info(SRC_FILE_PATH + 'cmdctl-accounts.csv')
         self.assertEqual(1, len(self.server._user_infos))
         self.assertTrue('root' in self.server._user_infos)
 
@@ -400,8 +403,8 @@
         self.assertRaises(CmdctlException, self.server._check_key_and_cert,
                          '/local/not-exist', 'cmdctl-keyfile.pem')
 
-        self.server._check_key_and_cert(FILE_PATH + 'cmdctl-keyfile.pem',
-                                        FILE_PATH + 'cmdctl-certfile.pem')
+        self.server._check_key_and_cert(SRC_FILE_PATH + 'cmdctl-keyfile.pem',
+                                        SRC_FILE_PATH + 'cmdctl-certfile.pem')
 
     def test_wrap_sock_in_ssl_context(self):
         sock = socket.socket()
@@ -413,8 +416,8 @@
 
         sock1 = socket.socket()
         self.server._wrap_socket_in_ssl_context(sock1, 
-                          FILE_PATH + 'cmdctl-keyfile.pem',
-                          FILE_PATH + 'cmdctl-certfile.pem')
+                          SRC_FILE_PATH + 'cmdctl-keyfile.pem',
+                          SRC_FILE_PATH + 'cmdctl-certfile.pem')
 
 class TestFuncNotInClass(unittest.TestCase):
     def test_check_port(self):