[svn] commit: r2145 - in /trunk: ./ configure.ac src/bin/cfgmgr/Makefile.am src/bin/cfgmgr/b10-cfgmgr.py.in src/bin/cfgmgr/tests/ src/bin/xfrin/ src/lib/cc/ src/lib/dns/ src/lib/dns/rdata/generic/rrsig_46.cc src/lib/dns/tests/

[BIND 10 source code commits]

Author: jelte
Date: Thu Jun 17 09:49:06 2010
New Revision: 2145

Log:
Merged changes for ticket #238 (tests for b10-cfgmgr)

Added:
    trunk/src/bin/cfgmgr/tests/
      - copied from r2144, branches/trac238/src/bin/cfgmgr/tests/
Modified:
    trunk/   (props changed)
    trunk/configure.ac
    trunk/src/bin/cfgmgr/Makefile.am
    trunk/src/bin/cfgmgr/b10-cfgmgr.py.in
    trunk/src/bin/xfrin/   (props changed)
    trunk/src/lib/cc/   (props changed)
    trunk/src/lib/dns/   (props changed)
    trunk/src/lib/dns/rdata/generic/rrsig_46.cc   (props changed)
    trunk/src/lib/dns/tests/   (props changed)

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Jun 17 09:49:06 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: trunk/src/bin/cfgmgr/Makefile.am
==============================================================================
--- trunk/src/bin/cfgmgr/Makefile.am (original)
+++ trunk/src/bin/cfgmgr/Makefile.am Thu Jun 17 09:49:06 2010
@@ -1,3 +1,5 @@
+SUBDIRS = tests
+
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 
 pkglibexec_SCRIPTS = b10-cfgmgr

Modified: trunk/src/bin/cfgmgr/b10-cfgmgr.py.in
==============================================================================
--- trunk/src/bin/cfgmgr/b10-cfgmgr.py.in (original)
+++ trunk/src/bin/cfgmgr/b10-cfgmgr.py.in Thu Jun 17 09:49:06 2010
@@ -40,7 +40,8 @@
     if cm:
         cm.running = False
 
-if __name__ == "__main__":
+def main():
+    global cm
     try:
         cm = ConfigManager(DATA_PATH)
         signal.signal(signal.SIGINT, signal_handler)
@@ -55,3 +56,6 @@
         print("[b10-cfgmgr] Interrupted, exiting")
     if cm:
         cm.write_config()
+
+if __name__ == "__main__":
+    main()