From: Jelte Jansen <jelte@isc.org>
Date: Mon, 13 Feb 2012 19:12:31 +0000 (+0100)
Subject: [master] temporarily disable part of test
X-Git-Tag: trac2351_base~97^2~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=047380ffbbf6e876282cc269ef16d8d6b168d6d2;p=thirdparty%2Fkea.git

[master] temporarily disable part of test

see ticket #1668
---

diff --git a/src/bin/stats/tests/b10-stats_test.py b/src/bin/stats/tests/b10-stats_test.py
index a50616029a..d9f8d37a14 100644
--- a/src/bin/stats/tests/b10-stats_test.py
+++ b/src/bin/stats/tests/b10-stats_test.py
@@ -202,15 +202,20 @@ class TestStats(unittest.TestCase):
         self.assertEqual(send_command("status", "Stats"),
                 (0, "Stats is up. (PID " + str(os.getpid()) + ")"))
         self.assertTrue(self.stats.running)
+        # Due to a race-condition related to the threads used in these
+        # tests, use of the mock session and the stopped check (see
+        # below), are temporarily disabled
+        # See ticket #1668
         # Override moduleCCSession so we can check if send_stopping is called
-        self.stats.mccs = MockModuleCCSession()
+        #self.stats.mccs = MockModuleCCSession()
         self.assertEqual(send_shutdown("Stats"), (0, None))
         self.assertFalse(self.stats.running)
         # Call server.shutdown with argument True so the thread.join() call
         # blocks and we are sure the main loop has finished (and set
         # mccs.stopped)
         self.stats_server.shutdown(True)
-        self.assertTrue(self.stats.mccs.stopped)
+        # Also temporarily disabled for #1668, see above
+        #self.assertTrue(self.stats.mccs.stopped)
 
         # start with err
         self.stats = stats.Stats()