BIND 10 trac2353, updated. 3c17e9586c94a0e4331cafe79e379e71f3d8a561 [2353] Unify verbose and non-verbose cases
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Dec 6 02:32:32 UTC 2012
The branch, trac2353 has been updated
via 3c17e9586c94a0e4331cafe79e379e71f3d8a561 (commit)
via bae03c0fbf0a82c2b88cb683fc81c30ab7f70ad0 (commit)
from ec4581da1a15031128504cf97c8c578669422126 (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 3c17e9586c94a0e4331cafe79e379e71f3d8a561
Author: Mukund Sivaraman <muks at isc.org>
Date: Thu Dec 6 07:59:20 2012 +0530
[2353] Unify verbose and non-verbose cases
commit bae03c0fbf0a82c2b88cb683fc81c30ab7f70ad0
Author: Mukund Sivaraman <muks at isc.org>
Date: Thu Dec 6 07:06:55 2012 +0530
[2353] Don't call real sleep() in mock function
-----------------------------------------------------------------------
Summary of changes:
src/bin/bind10/tests/bind10_test.py.in | 146 +++++++++++++++++---------------
1 file changed, 80 insertions(+), 66 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/bind10/tests/bind10_test.py.in b/src/bin/bind10/tests/bind10_test.py.in
index 1e62d9f..a0bfbef 100644
--- a/src/bin/bind10/tests/bind10_test.py.in
+++ b/src/bin/bind10/tests/bind10_test.py.in
@@ -1565,6 +1565,18 @@ class TestBossComponents(unittest.TestCase):
self.assertEqual([], bob.get_processes())
self.assertTrue(component.forceful)
+ def _start_msgq_helper(self, bob, verbose):
+ bob.verbose = verbose
+ pi = bob.start_msgq()
+ self.assertEqual('b10-msgq', pi.name)
+ self.assertEqual(['b10-msgq'], pi.args)
+ self.assertTrue(pi.dev_null_stdout)
+ self.assertEqual(pi.dev_null_stderr, not verbose)
+ self.assertEqual({'FOO': 'an env string'}, pi.env)
+
+ # this is set by ProcessInfo.spawn()
+ self.assertEqual(42147, pi.pid)
+
def test_start_msgq(self):
'''Test that b10-msgq is started.'''
bob = MockBobSimple()
@@ -1575,28 +1587,10 @@ class TestBossComponents(unittest.TestCase):
bob._make_process_info = bob._make_mock_process_info
# non-verbose case
- bob.verbose = False
- pi = bob.start_msgq()
- self.assertEqual('b10-msgq', pi.name)
- self.assertEqual(['b10-msgq'], pi.args)
- self.assertTrue(pi.dev_null_stdout)
- self.assertTrue(pi.dev_null_stderr)
- self.assertEqual({'FOO': 'an env string'}, pi.env)
-
- # this is set by ProcessInfo.spawn()
- self.assertEqual(42147, pi.pid)
+ self._start_msgq_helper(bob, False)
# verbose case
- bob.verbose = True
- pi = bob.start_msgq()
- self.assertEqual('b10-msgq', pi.name)
- self.assertEqual(['b10-msgq'], pi.args)
- self.assertTrue(pi.dev_null_stdout)
- self.assertFalse(pi.dev_null_stderr)
- self.assertEqual({'FOO': 'an env string'}, pi.env)
-
- # this is set by ProcessInfo.spawn()
- self.assertEqual(42147, pi.pid)
+ self._start_msgq_helper(bob, True)
def test_start_msgq_timeout(self):
'''Test that b10-msgq startup attempts connections several times
@@ -1727,7 +1721,6 @@ class TestBossComponents(unittest.TestCase):
def _my_sleep(nsec):
global attempts
attempts += 1
- return tmp_sleep(nsec)
time.sleep = _my_sleep
thrown = False
@@ -1797,22 +1790,40 @@ class TestBossComponents(unittest.TestCase):
self.assertEqual(bob.components[53].pid(), 53)
self.assertEqual(bob.components[53].address(), 'Test')
+ def _start_simple_helper(self, bob, verbose):
+ bob.verbose = verbose
+
+ args = ['/bin/true']
+ if verbose:
+ args.append('-v')
+
+ bob.start_simple('/bin/true')
+ self.assertEqual('/bin/true', bob.started_process_name)
+ self.assertEqual(args, bob.started_process_args)
+ self.assertEqual({}, bob.started_process_env)
+
def test_start_simple(self):
'''Test simple process startup.'''
bob = MockBobSimple()
bob.c_channel_env = {}
# non-verbose case
- bob.verbose = False
- bob.start_simple('/bin/true')
- self.assertEqual('/bin/true', bob.started_process_name)
- self.assertEqual(['/bin/true'], bob.started_process_args)
+ self._start_simple_helper(bob, False)
# verbose case
- bob.verbose = True
- bob.start_simple('/bin/true')
- self.assertEqual('/bin/true', bob.started_process_name)
- self.assertEqual(['/bin/true', '-v'], bob.started_process_args)
+ self._start_simple_helper(bob, True)
+
+ def _start_auth_helper(self, bob, verbose):
+ bob.verbose = verbose
+
+ args = ['b10-auth']
+ if verbose:
+ args.append('-v')
+
+ bob.start_auth()
+ self.assertEqual('b10-auth', bob.started_process_name)
+ self.assertEqual(args, bob.started_process_args)
+ self.assertEqual({'FOO': 'an env string'}, bob.started_process_env)
def test_start_auth(self):
'''Test that b10-auth is started.'''
@@ -1820,18 +1831,22 @@ class TestBossComponents(unittest.TestCase):
bob.c_channel_env = {'FOO': 'an env string'}
# non-verbose case
- bob.verbose = False
- bob.start_auth()
- self.assertEqual('b10-auth', bob.started_process_name)
- self.assertEqual(['b10-auth'], bob.started_process_args)
- self.assertEqual({'FOO': 'an env string'}, bob.started_process_env)
+ self._start_auth_helper(bob, False)
# verbose case
- bob.verbose = True
- bob.start_auth()
- self.assertEqual('b10-auth', bob.started_process_name)
- self.assertEqual(['b10-auth', '-v'], bob.started_process_args)
- self.assertEqual({'FOO': 'an env string'}, bob.started_process_env)
+ self._start_auth_helper(bob, True)
+
+ def _start_resolver_helper(self, bob, verbose):
+ bob.verbose = verbose
+
+ args = ['b10-resolver']
+ if verbose:
+ args.append('-v')
+
+ bob.start_resolver()
+ self.assertEqual('b10-resolver', bob.started_process_name)
+ self.assertEqual(args, bob.started_process_args)
+ self.assertEqual({'BAR': 'an env string'}, bob.started_process_env)
def test_start_resolver(self):
'''Test that b10-resolver is started.'''
@@ -1839,18 +1854,27 @@ class TestBossComponents(unittest.TestCase):
bob.c_channel_env = {'BAR': 'an env string'}
# non-verbose case
- bob.verbose = False
- bob.start_resolver()
- self.assertEqual('b10-resolver', bob.started_process_name)
- self.assertEqual(['b10-resolver'], bob.started_process_args)
- self.assertEqual({'BAR': 'an env string'}, bob.started_process_env)
+ self._start_resolver_helper(bob, False)
# verbose case
- bob.verbose = True
- bob.start_resolver()
- self.assertEqual('b10-resolver', bob.started_process_name)
- self.assertEqual(['b10-resolver', '-v'], bob.started_process_args)
- self.assertEqual({'BAR': 'an env string'}, bob.started_process_env)
+ self._start_resolver_helper(bob, True)
+
+ def _start_cmdctl_helper(self, bob, verbose, port = None):
+ bob.verbose = verbose
+
+ args = ['b10-cmdctl']
+
+ if port is not None:
+ bob.cmdctl_port = port
+ args.append('--port=9353')
+
+ if verbose:
+ args.append('-v')
+
+ bob.start_cmdctl()
+ self.assertEqual('b10-cmdctl', bob.started_process_name)
+ self.assertEqual(args, bob.started_process_args)
+ self.assertEqual({'BAZ': 'an env string'}, bob.started_process_env)
def test_start_cmdctl(self):
'''Test that b10-cmdctl is started.'''
@@ -1858,26 +1882,16 @@ class TestBossComponents(unittest.TestCase):
bob.c_channel_env = {'BAZ': 'an env string'}
# non-verbose case
- bob.verbose = False
- bob.start_cmdctl()
- self.assertEqual('b10-cmdctl', bob.started_process_name)
- self.assertEqual(['b10-cmdctl'], bob.started_process_args)
- self.assertEqual({'BAZ': 'an env string'}, bob.started_process_env)
+ self._start_cmdctl_helper(bob, False)
# verbose case
- bob.verbose = True
- bob.start_cmdctl()
- self.assertEqual('b10-cmdctl', bob.started_process_name)
- self.assertEqual(['b10-cmdctl', '-v'], bob.started_process_args)
- self.assertEqual({'BAZ': 'an env string'}, bob.started_process_env)
+ self._start_cmdctl_helper(bob, True)
- # with port
- bob.verbose = True
- bob.cmdctl_port = 9353
- bob.start_cmdctl()
- self.assertEqual('b10-cmdctl', bob.started_process_name)
- self.assertEqual(['b10-cmdctl', '--port=9353', '-v'], bob.started_process_args)
- self.assertEqual({'BAZ': 'an env string'}, bob.started_process_env)
+ # with port, non-verbose case
+ self._start_cmdctl_helper(bob, False, 9353)
+
+ # with port, verbose case
+ self._start_cmdctl_helper(bob, True, 9353)
def test_socket_data(self):
'''Test that BoB._socket_data works as expected.'''
More information about the bind10-changes
mailing list