From: Jelte Jansen <jelte@isc.org>
Date: Wed, 19 Sep 2012 08:03:30 +0000 (+0200)
Subject: [2190] do normal shutdown on msgq in statshttpd test
X-Git-Tag: trac2351_base~47^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=63e83a8f9c1ab9f7b32b76f80e65a771ee302cee;p=thirdparty%2Fkea.git

[2190] do normal shutdown on msgq in statshttpd test
---

diff --git a/src/bin/stats/tests/test_utils.py b/src/bin/stats/tests/test_utils.py
index f8abb57a65..55b08cba19 100644
--- a/src/bin/stats/tests/test_utils.py
+++ b/src/bin/stats/tests/test_utils.py
@@ -107,19 +107,10 @@ class MockMsgq:
 
     def run(self):
         self._started.set()
-        try:
-            self.msgq.run()
-        except Exception:
-            pass
-        finally:
-            # explicitly shut down the socket of the msgq before
-            # shutting down the msgq
-            self.msgq.listen_socket.shutdown(msgq.socket.SHUT_RDWR)
-            self.msgq.shutdown()
+        self.msgq.run()
 
     def shutdown(self):
-        # do nothing
-        pass
+        self.msgq.shutdown()
 
 class MockCfgmgr:
     def __init__(self):