BIND 10 trac1175, updated. fa11ddefe6cf767fd41e9cdb7cef2b4a40921139 [1175] - move up an assignment of the BIND10_MSGQ_SOCKET_FILE environment variable (BaseModules uses a constant file name during each testcase) - BaseModules checks whether msgq is ready after it started the msgq object. A SessionTimeout is raised here if not.

[BIND 10 source code commits]

The branch, trac1175 has been updated
       via  fa11ddefe6cf767fd41e9cdb7cef2b4a40921139 (commit)
      from  2b12c885d223c0f1a8250445c4c479f702c9d8ba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fa11ddefe6cf767fd41e9cdb7cef2b4a40921139
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Thu Sep 8 10:52:19 2011 +0900

    [1175]
     - move up an assignment of the BIND10_MSGQ_SOCKET_FILE environment variable
       (BaseModules uses a constant file name during each testcase)
     - BaseModules checks whether msgq is ready after it started the msgq object.
       A SessionTimeout is raised here if not.

-----------------------------------------------------------------------

Summary of changes:
 src/bin/stats/tests/test_utils.py |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/stats/tests/test_utils.py b/src/bin/stats/tests/test_utils.py
index cb63abb..20b959e 100644
--- a/src/bin/stats/tests/test_utils.py
+++ b/src/bin/stats/tests/test_utils.py
@@ -15,6 +15,10 @@ import isc.config.cfgmgr
 import stats
 import stats_httpd
 
+# Change value of BIND10_MSGQ_SOCKET_FILE in environment variables
+if 'BIND10_MSGQ_SOCKET_FILE' not in os.environ:
+    os.environ['BIND10_MSGQ_SOCKET_FILE'] = tempfile.mktemp(prefix='msgq_socket_')
+
 def send_command(command_name, module_name, params=None, session=None, nonblock=False, timeout=None):
     if session is not None:
         cc_session = session
@@ -323,12 +327,11 @@ class MyStatsHttpd(stats_httpd.StatsHttpd):
 
 class BaseModules:
     def __init__(self):
-        # Change value of BIND10_MSGQ_SOCKET_FILE in environment variables
-        if 'BIND10_MSGQ_SOCKET_FILE' not in os.environ:
-            os.environ['BIND10_MSGQ_SOCKET_FILE'] = tempfile.mktemp(prefix='msgq_socket_')
         # MockMsgq
         self.msgq = ThreadingServerManager(MockMsgq)
         self.msgq.run()
+        # Check whether msgq is ready. A SessionTimeout is raised here if not.
+        isc.cc.session.Session().close()
         # MockCfgmgr
         self.cfgmgr = ThreadingServerManager(MockCfgmgr)
         self.cfgmgr.run()