[433] Improve test and make status variable local in scope

diff --git a/src/bin/msgq/msgq.py.in b/src/bin/msgq/msgq.py.in
index 9fb0e7116889439047e7fd5a5faf756f70dc72a1..a28d97eaa4b23a03e6a487fe1f5bc78debc0b9da 100755 (executable)
--- a/src/bin/msgq/msgq.py.in
+++ b/src/bin/msgq/msgq.py.in
@@ -275,18 +275,18 @@ class MsgQ:
             # connect to the existing socket to see if there is an existing
             # msgq running. Only if that fails do we remove the file and
             # attempt to create a new socket.
-            self._existing = True
+            existing_msgq = True
             try:
                 self._session = isc.cc.Session(self.socket_file)
             except isc.cc.session.SessionError:
-                self._existing = False
+                existing_msgq = False
 
             self._session.close()
             self._session = None
 
-            if self._existing:
+            if existing_msgq:
                 logger.fatal(MSGQ_ALREADY_RUNNING)
-                raise MsgQRunningError("Message Queue daemon already running")
+                raise MsgQRunningError("b10-msgq already running")
 
             os.remove(self.socket_file)
 

diff --git a/src/bin/msgq/msgq_messages.mes b/src/bin/msgq/msgq_messages.mes
index 25ffff09e59f7ff473eeb650fa57aa9df13f7568..6f6177109aa48af17ef7714ff130a45934ee8b23 100644 (file)
--- a/src/bin/msgq/msgq_messages.mes
+++ b/src/bin/msgq/msgq_messages.mes
@@ -19,9 +19,9 @@
 # <topsrcdir>/tools/reorder_message_file.py to make sure the
 # messages are in the correct order.
 
-% MSGQ_ALREADY_RUNNING Another copy of the message queue daemon is already running.
-Only a single instance of the message queue daemon should ever be run at one
-time. This instance will now terminate.
+% MSGQ_ALREADY_RUNNING Another copy of b10-msgq is already running.
+Only a single instance of b10-msgq should ever be run at one time.
+This instance will now terminate.
 
 % MSGQ_CFGMGR_SUBSCRIBED The config manager subscribed to message queue
 This is a debug message. The message queue has little bit of special handling

diff --git a/src/bin/msgq/tests/msgq_run_test.py b/src/bin/msgq/tests/msgq_run_test.py
index f595535a2758024f474a1bf1d245f2bd30de0082..71bffd6b099bb9fa268f1f7f39d2206186e6d8da 100644 (file)
--- a/src/bin/msgq/tests/msgq_run_test.py
+++ b/src/bin/msgq/tests/msgq_run_test.py
@@ -333,9 +333,14 @@ class MsgqRunTest(unittest.TestCase):
         Check to make sure that an attempt to start a second copy of the MsgQ
         daemon fails.
         """
+
+        self.assertTrue (os.path.exists(SOCKET_PATH))
         self.__retcode = subprocess.call([MSGQ_PATH, '-s', SOCKET_PATH])
         self.assertNotEqual(self.__retcode, 0)
 
+        # Verify that the socket still exists
+        self.assertTrue (os.path.exists(SOCKET_PATH))
+
 if __name__ == '__main__':
     isc.log.init("msgq-tests")
     isc.log.resetUnitTestRootLogger()