BIND 10 master, updated. 185cb45b7ab1a164a7bb0a989c582a74ce50f2f3 [master] Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  185cb45b7ab1a164a7bb0a989c582a74ce50f2f3 (commit)
       via  047380ffbbf6e876282cc269ef16d8d6b168d6d2 (commit)
      from  72b239285aa03f9afa5685a4665451d89a941143 (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 185cb45b7ab1a164a7bb0a989c582a74ce50f2f3
Merge: 047380ffbbf6e876282cc269ef16d8d6b168d6d2 72b239285aa03f9afa5685a4665451d89a941143
Author: Jelte Jansen <jelte at isc.org>
Date:   Mon Feb 13 20:13:00 2012 +0100

    [master] Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

commit 047380ffbbf6e876282cc269ef16d8d6b168d6d2
Author: Jelte Jansen <jelte at isc.org>
Date:   Mon Feb 13 20:12:31 2012 +0100

    [master] temporarily disable part of test
    
    see ticket #1668

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

Summary of changes:
 src/bin/stats/tests/b10-stats_test.py |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/stats/tests/b10-stats_test.py b/src/bin/stats/tests/b10-stats_test.py
index a506160..d9f8d37 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()