Browse Source

moved python unittests to unittests/ directory
removed a few prints from cfgmgr


git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1002 e5f2f494-b856-4b98-b285-d166d9295462

Jelte Jansen 15 years ago
parent
commit
dbf288e25b

+ 1 - 1
configure.ac

@@ -188,7 +188,7 @@ AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py
            src/bin/msgq/run_msgq.sh
            src/bin/auth/config.h
            src/lib/config/cpp/data_def_unittests_config.h
-           src/lib/config/python/isc/config/config_test
+           src/lib/config/python/isc/config/unittests/config_test
            src/lib/dns/cpp/gen-rdatacode.py
           ], [
            chmod +x src/bin/cfgmgr/run_b10-cfgmgr.sh

+ 1 - 3
src/lib/config/python/isc/config/cfgmgr.py

@@ -313,7 +313,6 @@ class ConfigManager:
     def handle_msg(self, msg):
         """Handle a command from the cc channel to the configuration manager"""
         answer = {}
-        print("[XX] got msg: " + str(msg))
         cmd, arg = isc.config.ccsession.parse_command(msg)
         if cmd:
             if cmd == isc.config.ccsession.COMMAND_GET_COMMANDS_SPEC:
@@ -323,11 +322,10 @@ class ConfigManager:
             elif cmd == isc.config.ccsession.COMMAND_GET_CONFIG:
                 answer = self._handle_get_config(arg)
             elif cmd == isc.config.ccsession.COMMAND_SET_CONFIG:
-                print("[b10-cfgmgr] got set_config command")
                 answer = self._handle_set_config(arg)
             elif cmd == "shutdown":
                 # TODO: logging
-                print("[b10-cfgmgr] Received shutdown command")
+                #print("[b10-cfgmgr] Received shutdown command")
                 self.running = False
                 answer = isc.config.ccsession.create_answer(0)
             elif cmd == isc.config.ccsession.COMMAND_MODULE_SPEC:

src/lib/config/python/isc/config/ccsession_test.py → src/lib/config/python/isc/config/unittests/ccsession_test.py


src/lib/config/python/isc/config/cfgmgr_test.py → src/lib/config/python/isc/config/unittests/cfgmgr_test.py


src/lib/config/python/isc/config/config_data_test.py → src/lib/config/python/isc/config/unittests/config_data_test.py


+ 1 - 1
src/lib/config/python/isc/config/config_test.in

@@ -3,7 +3,7 @@
 PYTHON_EXEC=${PYTHON_EXEC:-@PYTHON@}
 export PYTHON_EXEC
 
-CONFIG_PATH=@abs_top_srcdir@/src/lib/config/python/isc/config/
+CONFIG_PATH=@abs_top_srcdir@/src/lib/config/python/isc/config/unittests
 
 PYTHONPATH=@abs_top_srcdir@/pyshared
 export PYTHONPATH

src/lib/config/python/isc/config/module_spec_test.py → src/lib/config/python/isc/config/unittests/module_spec_test.py


src/lib/config/python/isc/config/unittest_fakesession.py → src/lib/config/python/isc/config/unittests/unittest_fakesession.py