Commit dbf288e2 authored by Jelte Jansen's avatar Jelte Jansen
Browse files

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
parent 2d71c1c3
...@@ -188,7 +188,7 @@ AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py ...@@ -188,7 +188,7 @@ AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py
src/bin/msgq/run_msgq.sh src/bin/msgq/run_msgq.sh
src/bin/auth/config.h src/bin/auth/config.h
src/lib/config/cpp/data_def_unittests_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 src/lib/dns/cpp/gen-rdatacode.py
], [ ], [
chmod +x src/bin/cfgmgr/run_b10-cfgmgr.sh chmod +x src/bin/cfgmgr/run_b10-cfgmgr.sh
......
...@@ -313,7 +313,6 @@ class ConfigManager: ...@@ -313,7 +313,6 @@ class ConfigManager:
def handle_msg(self, msg): def handle_msg(self, msg):
"""Handle a command from the cc channel to the configuration manager""" """Handle a command from the cc channel to the configuration manager"""
answer = {} answer = {}
print("[XX] got msg: " + str(msg))
cmd, arg = isc.config.ccsession.parse_command(msg) cmd, arg = isc.config.ccsession.parse_command(msg)
if cmd: if cmd:
if cmd == isc.config.ccsession.COMMAND_GET_COMMANDS_SPEC: if cmd == isc.config.ccsession.COMMAND_GET_COMMANDS_SPEC:
...@@ -323,11 +322,10 @@ class ConfigManager: ...@@ -323,11 +322,10 @@ class ConfigManager:
elif cmd == isc.config.ccsession.COMMAND_GET_CONFIG: elif cmd == isc.config.ccsession.COMMAND_GET_CONFIG:
answer = self._handle_get_config(arg) answer = self._handle_get_config(arg)
elif cmd == isc.config.ccsession.COMMAND_SET_CONFIG: elif cmd == isc.config.ccsession.COMMAND_SET_CONFIG:
print("[b10-cfgmgr] got set_config command")
answer = self._handle_set_config(arg) answer = self._handle_set_config(arg)
elif cmd == "shutdown": elif cmd == "shutdown":
# TODO: logging # TODO: logging
print("[b10-cfgmgr] Received shutdown command") #print("[b10-cfgmgr] Received shutdown command")
self.running = False self.running = False
answer = isc.config.ccsession.create_answer(0) answer = isc.config.ccsession.create_answer(0)
elif cmd == isc.config.ccsession.COMMAND_MODULE_SPEC: elif cmd == isc.config.ccsession.COMMAND_MODULE_SPEC:
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
PYTHON_EXEC=${PYTHON_EXEC:-@PYTHON@} PYTHON_EXEC=${PYTHON_EXEC:-@PYTHON@}
export PYTHON_EXEC 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 PYTHONPATH=@abs_top_srcdir@/pyshared
export PYTHONPATH export PYTHONPATH
......
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