BIND 10 master, updated. 5c497dfce7d23487c2aefe9907f942c39c4c5846 Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  5c497dfce7d23487c2aefe9907f942c39c4c5846 (commit)
       via  83717978e3941e4eb5d7dc90d26a88256efd3175 (commit)
      from  df0c3599c1f3ad957df20eb8cc04c33d1c958e4a (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 5c497dfce7d23487c2aefe9907f942c39c4c5846
Merge: 83717978e3941e4eb5d7dc90d26a88256efd3175 df0c3599c1f3ad957df20eb8cc04c33d1c958e4a
Author: Shane Kerr <shane at isc.org>
Date:   Thu May 5 09:07:38 2011 +0200

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

commit 83717978e3941e4eb5d7dc90d26a88256efd3175
Author: Shane Kerr <shane at isc.org>
Date:   Thu May 5 09:06:29 2011 +0200

    Fix for msgq tests on Python 3.2
    The behavior of the unittest module was changed in the face of a
    test exiting, so we need to use os._exit() instead of sys.exit()
    to terminate.

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

Summary of changes:
 src/bin/msgq/tests/msgq_test.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/msgq/tests/msgq_test.py b/src/bin/msgq/tests/msgq_test.py
index f926845..26878f7 100644
--- a/src/bin/msgq/tests/msgq_test.py
+++ b/src/bin/msgq/tests/msgq_test.py
@@ -132,7 +132,7 @@ class SendNonblock(unittest.TestCase):
             task()
             # If we got here, then everything worked well and in time
             # In that case, we terminate successfully
-            sys.exit(0)	# needs exit code
+            os._exit(0)	# needs exit code
         else:
             (pid, status) = os.waitpid(task_pid, 0)
             self.assertEqual(0, status,