[svn] commit: r2127 - in /branches/trac238: configure.ac src/bin/cfgmgr/Makefile.am src/bin/cfgmgr/b10-cfgmgr.py.in src/bin/cfgmgr/tests/ src/bin/cfgmgr/tests/Makefile.am src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in

[BIND 10 source code commits]

Author: jelte
Date: Wed Jun 16 16:10:49 2010
New Revision: 2127

Log:
unit tests for b10-cfgmgr
moved a little bit of code into a main() function (instead of calling it directly), for easier testing
module magic happening in the test.

Added:
    branches/trac238/src/bin/cfgmgr/tests/
    branches/trac238/src/bin/cfgmgr/tests/Makefile.am
    branches/trac238/src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in
Modified:
    branches/trac238/configure.ac
    branches/trac238/src/bin/cfgmgr/Makefile.am
    branches/trac238/src/bin/cfgmgr/b10-cfgmgr.py.in

Modified: branches/trac238/configure.ac
==============================================================================
--- branches/trac238/configure.ac (original)
+++ branches/trac238/configure.ac Wed Jun 16 16:10:49 2010
@@ -393,6 +393,7 @@
                  src/bin/bindctl/Makefile
                  src/bin/bindctl/tests/Makefile
                  src/bin/cfgmgr/Makefile
+                 src/bin/cfgmgr/tests/Makefile
                  src/bin/host/Makefile
                  src/bin/loadzone/Makefile
                  src/bin/msgq/Makefile
@@ -423,6 +424,7 @@
                  src/lib/xfr/Makefile
                ])
 AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py
+           src/bin/cfgmgr/tests/b10-cfgmgr_test.py
            src/bin/cmdctl/cmdctl.py
            src/bin/cmdctl/run_b10-cmdctl.sh
            src/bin/cmdctl/tests/cmdctl_test

Modified: branches/trac238/src/bin/cfgmgr/Makefile.am
==============================================================================
--- branches/trac238/src/bin/cfgmgr/Makefile.am (original)
+++ branches/trac238/src/bin/cfgmgr/Makefile.am Wed Jun 16 16:10:49 2010
@@ -1,3 +1,5 @@
+SUBDIRS = tests
+
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 
 pkglibexec_SCRIPTS = b10-cfgmgr

Modified: branches/trac238/src/bin/cfgmgr/b10-cfgmgr.py.in
==============================================================================
--- branches/trac238/src/bin/cfgmgr/b10-cfgmgr.py.in (original)
+++ branches/trac238/src/bin/cfgmgr/b10-cfgmgr.py.in Wed Jun 16 16:10:49 2010
@@ -38,7 +38,8 @@
     if cm:
         cm.running = False
 
-if __name__ == "__main__":
+def main():
+    global cm
     try:
         cm = ConfigManager(DATA_PATH)
         signal.signal(signal.SIGINT, signal_handler)
@@ -53,3 +54,6 @@
         print("[b10-cfgmgr] Interrupted, exiting")
     if cm:
         cm.write_config()
+
+if __name__ == "__main__":
+    main()