BIND 10 master, updated. 6a9dbeff7d28a8ef91ceddff5dbcdef9a7d1452e [master] Show testnames when running Python unit tests
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Mar 29 13:20:21 UTC 2012
The branch, master has been updated
via 6a9dbeff7d28a8ef91ceddff5dbcdef9a7d1452e (commit)
via 5ef450d431113ab2aa349d6200f7f69f55e975f4 (commit)
from 34da803fd804c6c0fa7acb90ff46780df69d5898 (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 6a9dbeff7d28a8ef91ceddff5dbcdef9a7d1452e
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Mar 27 14:02:00 2012 +0530
[master] Show testnames when running Python unit tests
commit 5ef450d431113ab2aa349d6200f7f69f55e975f4
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Mar 27 13:50:39 2012 +0530
bug #1819: Remove duplicated code
-----------------------------------------------------------------------
Summary of changes:
src/bin/bind10/tests/args_test.py | 2 +-
src/bin/bind10/tests/bind10_test.py.in | 61 +++++--------------
src/bin/bindctl/tests/bindctl_test.py | 2 +-
src/bin/bindctl/tests/cmdparse_test.py | 2 +-
src/bin/cfgmgr/plugins/tests/logging_test.py | 2 +-
src/bin/cfgmgr/plugins/tests/tsig_keys_test.py | 2 +-
src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in | 2 +-
src/bin/cmdctl/tests/cmdctl_test.py | 2 +-
src/bin/ddns/tests/ddns_test.py | 2 +-
src/bin/dhcp6/tests/dhcp6_test.py | 2 +-
src/bin/msgq/tests/msgq_test.py | 2 +-
src/bin/stats/tests/b10-stats-httpd_test.py | 2 +-
src/bin/stats/tests/b10-stats_test.py | 2 +-
src/bin/tests/process_rename_test.py.in | 2 +-
src/bin/xfrin/tests/xfrin_test.py | 2 +-
src/bin/xfrout/tests/xfrout_test.py.in | 2 +-
src/bin/zonemgr/tests/zonemgr_test.py | 2 +-
src/lib/dns/python/tests/edns_python_test.py | 2 +-
src/lib/dns/python/tests/message_python_test.py | 2 +-
.../python/tests/messagerenderer_python_test.py | 2 +-
src/lib/dns/python/tests/name_python_test.py | 2 +-
src/lib/dns/python/tests/nsec3hash_python_test.py | 2 +-
src/lib/dns/python/tests/opcode_python_test.py | 2 +-
src/lib/dns/python/tests/question_python_test.py | 2 +-
src/lib/dns/python/tests/rcode_python_test.py | 2 +-
src/lib/dns/python/tests/rdata_python_test.py | 2 +-
src/lib/dns/python/tests/rrclass_python_test.py | 2 +-
src/lib/dns/python/tests/rrset_python_test.py | 2 +-
src/lib/dns/python/tests/rrttl_python_test.py | 2 +-
src/lib/dns/python/tests/rrtype_python_test.py | 2 +-
src/lib/dns/python/tests/serial_python_test.py | 2 +-
src/lib/dns/python/tests/tsig_python_test.py | 2 +-
src/lib/dns/python/tests/tsig_rdata_python_test.py | 2 +-
src/lib/dns/python/tests/tsigerror_python_test.py | 2 +-
src/lib/dns/python/tests/tsigkey_python_test.py | 2 +-
src/lib/dns/python/tests/tsigrecord_python_test.py | 2 +-
src/lib/python/isc/acl/tests/acl_test.py | 2 +-
src/lib/python/isc/acl/tests/dns_test.py | 2 +-
src/lib/python/isc/bind10/tests/component_test.py | 2 +-
.../python/isc/bind10/tests/sockcreator_test.py | 2 +-
.../python/isc/bind10/tests/socket_cache_test.py | 2 +-
src/lib/python/isc/cc/tests/data_test.py | 2 +-
src/lib/python/isc/cc/tests/message_test.py | 2 +-
src/lib/python/isc/cc/tests/session_test.py | 2 +-
src/lib/python/isc/cc/tests/test_session.py | 2 +-
src/lib/python/isc/config/tests/ccsession_test.py | 2 +-
src/lib/python/isc/config/tests/cfgmgr_test.py | 2 +-
.../python/isc/config/tests/config_data_test.py | 2 +-
.../python/isc/config/tests/module_spec_test.py | 2 +-
src/lib/python/isc/datasrc/tests/datasrc_test.py | 2 +-
src/lib/python/isc/datasrc/tests/master_test.py | 2 +-
.../python/isc/datasrc/tests/sqlite3_ds_test.py | 2 +-
src/lib/python/isc/log/tests/log_test.py | 2 +-
src/lib/python/isc/net/tests/addr_test.py | 2 +-
src/lib/python/isc/net/tests/parse_test.py | 2 +-
src/lib/python/isc/notify/tests/notify_out_test.py | 2 +-
.../isc/server_common/tests/tsig_keyring_test.py | 2 +-
.../isc/util/cio/tests/socketsession_test.py | 2 +-
src/lib/python/isc/util/tests/file_test.py | 2 +-
src/lib/python/isc/util/tests/process_test.py | 2 +-
.../isc/util/tests/socketserver_mixin_test.py | 2 +-
src/lib/python/isc/xfrin/tests/diff_tests.py | 2 +-
62 files changed, 77 insertions(+), 106 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/bind10/tests/args_test.py b/src/bin/bind10/tests/args_test.py
index 93a7cea..70a5e2d 100644
--- a/src/bin/bind10/tests/args_test.py
+++ b/src/bin/bind10/tests/args_test.py
@@ -154,4 +154,4 @@ class TestBossArgs(unittest.TestCase):
bob.wait()
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/bin/bind10/tests/bind10_test.py.in b/src/bin/bind10/tests/bind10_test.py.in
index 0f397ae..ffdfd05 100644
--- a/src/bin/bind10/tests/bind10_test.py.in
+++ b/src/bin/bind10/tests/bind10_test.py.in
@@ -1176,11 +1176,13 @@ class TestBossComponents(unittest.TestCase):
# We check somewhere else that the shutdown is actually called
# from there (the test_kills).
- def test_kills(self):
+ def __real_test_kill(self, nokill = False):
"""
- Test that the boss kills components which don't want to stop.
+ Helper function that does the actual kill functionality testing.
"""
bob = MockBob()
+ bob.nokill = nokill
+
killed = []
class ImmortalComponent:
"""
@@ -1214,59 +1216,28 @@ class TestBossComponents(unittest.TestCase):
# Here, killed is an array where False is added if SIGTERM
# should be sent, or True if SIGKILL should be sent, in order in
# which they're sent.
- self.assertEqual([False, True], killed)
+ if nokill:
+ self.assertEqual([], killed)
+ else:
+ self.assertEqual([False, True], killed)
self.assertTrue(self.__called)
bob._component_configurator.shutdown = orig
+ def test_kills(self):
+ """
+ Test that the boss kills components which don't want to stop.
+ """
+ self.__real_test_kill()
+
def test_nokill(self):
"""
Test that the boss *doesn't* kill components which don't want to
stop, when asked not to (by passing the --no-kill option which
sets bob.nokill to True).
"""
- bob = MockBob()
- bob.nokill = True
-
- killed = []
- class ImmortalComponent:
- """
- An immortal component. It does not stop when it is told so
- (anyway it is not told so). It does not die if it is killed
- the first time. It dies only when killed forcefully.
- """
- def kill(self, forceful=False):
- killed.append(forceful)
- if forceful:
- bob.components = {}
- def pid(self):
- return 1
- def name(self):
- return "Immortal"
- bob.components = {}
- bob.register_process(1, ImmortalComponent())
-
- # While at it, we check the configurator shutdown is actually called
- orig = bob._component_configurator.shutdown
- bob._component_configurator.shutdown = self.__nullary_hook
- self.__called = False
-
- bob.ccs = MockModuleCCSession()
- self.assertFalse(bob.ccs.stopped)
-
- bob.shutdown()
-
- self.assertTrue(bob.ccs.stopped)
-
- # Here, killed is an array where False is added if SIGTERM
- # should be sent, or True if SIGKILL should be sent, in order in
- # which they're sent.
- self.assertEqual([], killed)
-
- self.assertTrue(self.__called)
-
- bob._component_configurator.shutdown = orig
+ self.__real_test_kill(True)
def test_component_shutdown(self):
"""
@@ -1496,4 +1467,4 @@ if __name__ == '__main__':
# store os.environ for test_unchanged_environment
original_os_environ = copy.deepcopy(os.environ)
isc.log.resetUnitTestRootLogger()
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/bin/bindctl/tests/bindctl_test.py b/src/bin/bindctl/tests/bindctl_test.py
index 31a6bda..f547195 100644
--- a/src/bin/bindctl/tests/bindctl_test.py
+++ b/src/bin/bindctl/tests/bindctl_test.py
@@ -470,5 +470,5 @@ class TestCommandLineOptions(unittest.TestCase):
['--csv-file-dir'])
if __name__== "__main__":
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/bin/bindctl/tests/cmdparse_test.py b/src/bin/bindctl/tests/cmdparse_test.py
index 9150ed3..6bed14b 100644
--- a/src/bin/bindctl/tests/cmdparse_test.py
+++ b/src/bin/bindctl/tests/cmdparse_test.py
@@ -84,5 +84,5 @@ class TestCmdParse(unittest.TestCase):
if __name__== "__main__":
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/bin/cfgmgr/plugins/tests/logging_test.py b/src/bin/cfgmgr/plugins/tests/logging_test.py
index 818a596..b6bf02c 100644
--- a/src/bin/cfgmgr/plugins/tests/logging_test.py
+++ b/src/bin/cfgmgr/plugins/tests/logging_test.py
@@ -132,4 +132,4 @@ class LoggingConfCheckTest(unittest.TestCase):
'severity': 123}]}))
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/bin/cfgmgr/plugins/tests/tsig_keys_test.py b/src/bin/cfgmgr/plugins/tests/tsig_keys_test.py
index 808f28a..a7f228a 100644
--- a/src/bin/cfgmgr/plugins/tests/tsig_keys_test.py
+++ b/src/bin/cfgmgr/plugins/tests/tsig_keys_test.py
@@ -100,4 +100,4 @@ class TSigKeysTest(unittest.TestCase):
self.assertNotEqual(None, tsig_keys.check({'keys': {}}))
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in b/src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in
index ca91c9c..4b84f1f 100644
--- a/src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in
+++ b/src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in
@@ -201,5 +201,5 @@ class TestParseArgs(unittest.TestCase):
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/bin/cmdctl/tests/cmdctl_test.py b/src/bin/cmdctl/tests/cmdctl_test.py
index 5fdabb4..83eff27 100644
--- a/src/bin/cmdctl/tests/cmdctl_test.py
+++ b/src/bin/cmdctl/tests/cmdctl_test.py
@@ -483,6 +483,6 @@ class TestFuncNotInClass(unittest.TestCase):
if __name__== "__main__":
isc.log.resetUnitTestRootLogger()
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/bin/ddns/tests/ddns_test.py b/src/bin/ddns/tests/ddns_test.py
index 395aacc..19f0ab3 100755
--- a/src/bin/ddns/tests/ddns_test.py
+++ b/src/bin/ddns/tests/ddns_test.py
@@ -416,4 +416,4 @@ class TestMain(unittest.TestCase):
if __name__== "__main__":
isc.log.resetUnitTestRootLogger()
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/bin/dhcp6/tests/dhcp6_test.py b/src/bin/dhcp6/tests/dhcp6_test.py
index d63e04d..77588bb 100644
--- a/src/bin/dhcp6/tests/dhcp6_test.py
+++ b/src/bin/dhcp6/tests/dhcp6_test.py
@@ -68,4 +68,4 @@ class TestDhcpv6Daemon(unittest.TestCase):
print("Ignoring failed kill attempt. Process is dead already.")
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/bin/msgq/tests/msgq_test.py b/src/bin/msgq/tests/msgq_test.py
index fe4f7d4..16f0d5f 100644
--- a/src/bin/msgq/tests/msgq_test.py
+++ b/src/bin/msgq/tests/msgq_test.py
@@ -234,4 +234,4 @@ class SendNonblock(unittest.TestCase):
self.send_many(data)
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/bin/stats/tests/b10-stats-httpd_test.py b/src/bin/stats/tests/b10-stats-httpd_test.py
index e74405a..c1314ee 100644
--- a/src/bin/stats/tests/b10-stats-httpd_test.py
+++ b/src/bin/stats/tests/b10-stats-httpd_test.py
@@ -1326,4 +1326,4 @@ class TestStatsHttpd(unittest.TestCase):
imp.reload(stats_httpd)
if __name__ == "__main__":
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/bin/stats/tests/b10-stats_test.py b/src/bin/stats/tests/b10-stats_test.py
index 5262b8a..c098b46 100644
--- a/src/bin/stats/tests/b10-stats_test.py
+++ b/src/bin/stats/tests/b10-stats_test.py
@@ -912,7 +912,7 @@ class TestOSEnv(unittest.TestCase):
imp.reload(stats)
def test_main():
- unittest.main()
+ unittest.main(verbosity=2)
if __name__ == "__main__":
test_main()
diff --git a/src/bin/tests/process_rename_test.py.in b/src/bin/tests/process_rename_test.py.in
index f96c023..0f730c1 100644
--- a/src/bin/tests/process_rename_test.py.in
+++ b/src/bin/tests/process_rename_test.py.in
@@ -61,4 +61,4 @@ class TestRename(unittest.TestCase):
self.__scan(d, script, fun)
if __name__ == "__main__":
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/bin/xfrin/tests/xfrin_test.py b/src/bin/xfrin/tests/xfrin_test.py
index a5c92ab..7481257 100644
--- a/src/bin/xfrin/tests/xfrin_test.py
+++ b/src/bin/xfrin/tests/xfrin_test.py
@@ -2848,6 +2848,6 @@ class TestXfrinTransferStats(unittest.TestCase):
if __name__== "__main__":
try:
isc.log.resetUnitTestRootLogger()
- unittest.main()
+ unittest.main(verbosity=2)
except KeyboardInterrupt as e:
print(e)
diff --git a/src/bin/xfrout/tests/xfrout_test.py.in b/src/bin/xfrout/tests/xfrout_test.py.in
index b60535c..5582fac 100644
--- a/src/bin/xfrout/tests/xfrout_test.py.in
+++ b/src/bin/xfrout/tests/xfrout_test.py.in
@@ -1472,4 +1472,4 @@ class TestXfroutServer(unittest.TestCase):
if __name__== "__main__":
isc.log.resetUnitTestRootLogger()
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/bin/zonemgr/tests/zonemgr_test.py b/src/bin/zonemgr/tests/zonemgr_test.py
index 29924c8..152908e 100644
--- a/src/bin/zonemgr/tests/zonemgr_test.py
+++ b/src/bin/zonemgr/tests/zonemgr_test.py
@@ -696,4 +696,4 @@ class TestZonemgr(unittest.TestCase):
if __name__== "__main__":
isc.log.resetUnitTestRootLogger()
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/dns/python/tests/edns_python_test.py b/src/lib/dns/python/tests/edns_python_test.py
index b249213..2c8c200 100644
--- a/src/lib/dns/python/tests/edns_python_test.py
+++ b/src/lib/dns/python/tests/edns_python_test.py
@@ -174,4 +174,4 @@ class EDNSTest(unittest.TestCase):
self.rrttl_badver, self.opt_rdata)
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/dns/python/tests/message_python_test.py b/src/lib/dns/python/tests/message_python_test.py
index 86574fb..fae5228 100644
--- a/src/lib/dns/python/tests/message_python_test.py
+++ b/src/lib/dns/python/tests/message_python_test.py
@@ -624,4 +624,4 @@ test.example.com. 3600 IN A 192.0.2.2
self.p, "message_fromWire16.wire")
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/dns/python/tests/messagerenderer_python_test.py b/src/lib/dns/python/tests/messagerenderer_python_test.py
index 5362496..8048c5e 100644
--- a/src/lib/dns/python/tests/messagerenderer_python_test.py
+++ b/src/lib/dns/python/tests/messagerenderer_python_test.py
@@ -117,4 +117,4 @@ class MessageRendererTest(unittest.TestCase):
self.assertRaises(TypeError, renderer.set_compress_mode, "wrong")
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/dns/python/tests/name_python_test.py b/src/lib/dns/python/tests/name_python_test.py
index 5263412..9d20499 100644
--- a/src/lib/dns/python/tests/name_python_test.py
+++ b/src/lib/dns/python/tests/name_python_test.py
@@ -219,4 +219,4 @@ class NameTest(unittest.TestCase):
self.assertFalse(self.name2 >= self.name1)
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/dns/python/tests/nsec3hash_python_test.py b/src/lib/dns/python/tests/nsec3hash_python_test.py
index 1a247d0..f6fea13 100644
--- a/src/lib/dns/python/tests/nsec3hash_python_test.py
+++ b/src/lib/dns/python/tests/nsec3hash_python_test.py
@@ -125,4 +125,4 @@ class NSEC3HashTest(unittest.TestCase):
Rdata(RRType.A(), RRClass.IN(), "192.0.2.1"))
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/dns/python/tests/opcode_python_test.py b/src/lib/dns/python/tests/opcode_python_test.py
index 84f449f..52767ec 100644
--- a/src/lib/dns/python/tests/opcode_python_test.py
+++ b/src/lib/dns/python/tests/opcode_python_test.py
@@ -109,4 +109,4 @@ class OpcodeTest(unittest.TestCase):
self.assertEqual(TypeError, type(err))
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/dns/python/tests/question_python_test.py b/src/lib/dns/python/tests/question_python_test.py
index 8c8c815..ce13d70 100644
--- a/src/lib/dns/python/tests/question_python_test.py
+++ b/src/lib/dns/python/tests/question_python_test.py
@@ -98,4 +98,4 @@ class QuestionTest(unittest.TestCase):
self.assertEqual(0, renderer.get_length())
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/dns/python/tests/rcode_python_test.py b/src/lib/dns/python/tests/rcode_python_test.py
index 77fed3a..6be2f12 100644
--- a/src/lib/dns/python/tests/rcode_python_test.py
+++ b/src/lib/dns/python/tests/rcode_python_test.py
@@ -141,4 +141,4 @@ class RcodeTest(unittest.TestCase):
self.assertEqual(TypeError, type(err))
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/dns/python/tests/rdata_python_test.py b/src/lib/dns/python/tests/rdata_python_test.py
index 81dea5f..86bec36 100644
--- a/src/lib/dns/python/tests/rdata_python_test.py
+++ b/src/lib/dns/python/tests/rdata_python_test.py
@@ -92,4 +92,4 @@ class RdataTest(unittest.TestCase):
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/dns/python/tests/rrclass_python_test.py b/src/lib/dns/python/tests/rrclass_python_test.py
index 38d8c8c..ca016b4 100644
--- a/src/lib/dns/python/tests/rrclass_python_test.py
+++ b/src/lib/dns/python/tests/rrclass_python_test.py
@@ -86,4 +86,4 @@ class RRClassTest(unittest.TestCase):
self.assertEqual(255, RRClass.ANY().get_code())
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/dns/python/tests/rrset_python_test.py b/src/lib/dns/python/tests/rrset_python_test.py
index de475a7..a0c8603 100644
--- a/src/lib/dns/python/tests/rrset_python_test.py
+++ b/src/lib/dns/python/tests/rrset_python_test.py
@@ -119,4 +119,4 @@ class TestModuleSpec(unittest.TestCase):
self.assertEqual(1, sys.getrefcount(self.rrset_a.get_rdata()[0]))
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/dns/python/tests/rrttl_python_test.py b/src/lib/dns/python/tests/rrttl_python_test.py
index aa4a34d..ab3568a 100644
--- a/src/lib/dns/python/tests/rrttl_python_test.py
+++ b/src/lib/dns/python/tests/rrttl_python_test.py
@@ -80,4 +80,4 @@ class RRTTLTest(unittest.TestCase):
self.assertTrue(self.t1 <= self.t2)
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/dns/python/tests/rrtype_python_test.py b/src/lib/dns/python/tests/rrtype_python_test.py
index 7135426..5ef6515 100644
--- a/src/lib/dns/python/tests/rrtype_python_test.py
+++ b/src/lib/dns/python/tests/rrtype_python_test.py
@@ -141,4 +141,4 @@ class TestModuleSpec(unittest.TestCase):
self.assertEqual(255, RRType.ANY().get_code())
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/dns/python/tests/serial_python_test.py b/src/lib/dns/python/tests/serial_python_test.py
index 0ca08c2..eacf489 100644
--- a/src/lib/dns/python/tests/serial_python_test.py
+++ b/src/lib/dns/python/tests/serial_python_test.py
@@ -108,4 +108,4 @@ class SerialTest(unittest.TestCase):
self.assertRaises(TypeError, lambda: "bad" + self.zero)
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/dns/python/tests/tsig_python_test.py b/src/lib/dns/python/tests/tsig_python_test.py
index 7e5515d..d958049 100644
--- a/src/lib/dns/python/tests/tsig_python_test.py
+++ b/src/lib/dns/python/tests/tsig_python_test.py
@@ -551,4 +551,4 @@ class TSIGContextTest(unittest.TestCase):
TSIGContext.STATE_RECEIVED_REQUEST)
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/dns/python/tests/tsig_rdata_python_test.py b/src/lib/dns/python/tests/tsig_rdata_python_test.py
index 7b861d6..fc33ad8 100644
--- a/src/lib/dns/python/tests/tsig_rdata_python_test.py
+++ b/src/lib/dns/python/tests/tsig_rdata_python_test.py
@@ -27,4 +27,4 @@ class TSIGRdataTest(unittest.TestCase):
self.assertEqual(1, sys.getrefcount(tsig.get_algorithm()))
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/dns/python/tests/tsigerror_python_test.py b/src/lib/dns/python/tests/tsigerror_python_test.py
index a968b6b..65e0ea1 100644
--- a/src/lib/dns/python/tests/tsigerror_python_test.py
+++ b/src/lib/dns/python/tests/tsigerror_python_test.py
@@ -94,4 +94,4 @@ class TSIGErrorTest(unittest.TestCase):
self.assertEqual(1, sys.getrefcount(TSIGError.BAD_SIG.to_rcode()))
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/dns/python/tests/tsigkey_python_test.py b/src/lib/dns/python/tests/tsigkey_python_test.py
index 516bea4..01e88b0 100644
--- a/src/lib/dns/python/tests/tsigkey_python_test.py
+++ b/src/lib/dns/python/tests/tsigkey_python_test.py
@@ -209,4 +209,4 @@ class TSIGKeyRingTest(unittest.TestCase):
self.sha1_name))
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/dns/python/tests/tsigrecord_python_test.py b/src/lib/dns/python/tests/tsigrecord_python_test.py
index 813a23b..9839c29 100644
--- a/src/lib/dns/python/tests/tsigrecord_python_test.py
+++ b/src/lib/dns/python/tests/tsigrecord_python_test.py
@@ -41,4 +41,4 @@ class TSIGRecordTest(unittest.TestCase):
self.assertEqual(expected_text, str(self.test_record))
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/acl/tests/acl_test.py b/src/lib/python/isc/acl/tests/acl_test.py
index 24a0c94..39b7e7b 100644
--- a/src/lib/python/isc/acl/tests/acl_test.py
+++ b/src/lib/python/isc/acl/tests/acl_test.py
@@ -26,4 +26,4 @@ class ACLTest(unittest.TestCase):
self.assertTrue(DROP != ACCEPT)
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/acl/tests/dns_test.py b/src/lib/python/isc/acl/tests/dns_test.py
index 7ee3023..9b05cd8 100644
--- a/src/lib/python/isc/acl/tests/dns_test.py
+++ b/src/lib/python/isc/acl/tests/dns_test.py
@@ -354,4 +354,4 @@ class RequestLoaderTest(unittest.TestCase):
self.assertRaises(Error, RequestLoader)
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/bind10/tests/component_test.py b/src/lib/python/isc/bind10/tests/component_test.py
index ec0e8af..997ad78 100644
--- a/src/lib/python/isc/bind10/tests/component_test.py
+++ b/src/lib/python/isc/bind10/tests/component_test.py
@@ -1057,4 +1057,4 @@ class ConfiguratorTest(BossUtils, unittest.TestCase):
if __name__ == '__main__':
isc.log.init("bind10") # FIXME Should this be needed?
isc.log.resetUnitTestRootLogger()
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/bind10/tests/sockcreator_test.py b/src/lib/python/isc/bind10/tests/sockcreator_test.py
index d97d21b..fb8547a 100644
--- a/src/lib/python/isc/bind10/tests/sockcreator_test.py
+++ b/src/lib/python/isc/bind10/tests/sockcreator_test.py
@@ -321,4 +321,4 @@ class WrapTests(unittest.TestCase):
if __name__ == '__main__':
isc.log.init("bind10") # FIXME Should this be needed?
isc.log.resetUnitTestRootLogger()
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/bind10/tests/socket_cache_test.py b/src/lib/python/isc/bind10/tests/socket_cache_test.py
index bbbf776..68f45af 100644
--- a/src/lib/python/isc/bind10/tests/socket_cache_test.py
+++ b/src/lib/python/isc/bind10/tests/socket_cache_test.py
@@ -393,4 +393,4 @@ class SocketCacheTest(Test):
if __name__ == '__main__':
isc.log.init("bind10")
isc.log.resetUnitTestRootLogger()
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/cc/tests/data_test.py b/src/lib/python/isc/cc/tests/data_test.py
index b8dc222..0677d9c 100644
--- a/src/lib/python/isc/cc/tests/data_test.py
+++ b/src/lib/python/isc/cc/tests/data_test.py
@@ -239,6 +239,6 @@ if __name__ == '__main__':
#if not 'CONFIG_TESTDATA_PATH' in os.environ:
# print("You need to set the environment variable CONFIG_TESTDATA_PATH to point to the directory containing the test data files")
# exit(1)
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/cc/tests/message_test.py b/src/lib/python/isc/cc/tests/message_test.py
index c417068..19b8d95 100644
--- a/src/lib/python/isc/cc/tests/message_test.py
+++ b/src/lib/python/isc/cc/tests/message_test.py
@@ -54,6 +54,6 @@ class MessageTest(unittest.TestCase):
self.assertRaises(ValueError, isc.cc.message.from_wire, b']')
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/cc/tests/session_test.py b/src/lib/python/isc/cc/tests/session_test.py
index e589085..2d3e98e 100644
--- a/src/lib/python/isc/cc/tests/session_test.py
+++ b/src/lib/python/isc/cc/tests/session_test.py
@@ -409,5 +409,5 @@ class testSession(unittest.TestCase):
os.remove(TEST_SOCKET_FILE)
if __name__ == "__main__":
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/cc/tests/test_session.py b/src/lib/python/isc/cc/tests/test_session.py
index 3c4960f..2997dd6 100644
--- a/src/lib/python/isc/cc/tests/test_session.py
+++ b/src/lib/python/isc/cc/tests/test_session.py
@@ -57,4 +57,4 @@ class TestCCWireEncoding(unittest.TestCase):
self.assertEqual(env["instance"], "i4")
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/config/tests/ccsession_test.py b/src/lib/python/isc/config/tests/ccsession_test.py
index d1060bf..2622075 100644
--- a/src/lib/python/isc/config/tests/ccsession_test.py
+++ b/src/lib/python/isc/config/tests/ccsession_test.py
@@ -1108,5 +1108,5 @@ class TestUIModuleCCSession(unittest.TestCase):
if __name__ == '__main__':
isc.log.init("bind10")
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/config/tests/cfgmgr_test.py b/src/lib/python/isc/config/tests/cfgmgr_test.py
index 891a7d7..13339d4 100644
--- a/src/lib/python/isc/config/tests/cfgmgr_test.py
+++ b/src/lib/python/isc/config/tests/cfgmgr_test.py
@@ -626,4 +626,4 @@ if __name__ == '__main__':
exit(1)
isc.log.init("unittests")
isc.log.resetUnitTestRootLogger()
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/config/tests/config_data_test.py b/src/lib/python/isc/config/tests/config_data_test.py
index 446d898..8c86e8c 100644
--- a/src/lib/python/isc/config/tests/config_data_test.py
+++ b/src/lib/python/isc/config/tests/config_data_test.py
@@ -698,5 +698,5 @@ class TestMultiConfigData(unittest.TestCase):
], config_items)
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/config/tests/module_spec_test.py b/src/lib/python/isc/config/tests/module_spec_test.py
index fc53d23..f594a68 100644
--- a/src/lib/python/isc/config/tests/module_spec_test.py
+++ b/src/lib/python/isc/config/tests/module_spec_test.py
@@ -442,4 +442,4 @@ class TestModuleSpec(unittest.TestCase):
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/datasrc/tests/datasrc_test.py b/src/lib/python/isc/datasrc/tests/datasrc_test.py
index a6f8f16..5317403 100644
--- a/src/lib/python/isc/datasrc/tests/datasrc_test.py
+++ b/src/lib/python/isc/datasrc/tests/datasrc_test.py
@@ -893,4 +893,4 @@ class JournalRead(unittest.TestCase):
if __name__ == "__main__":
isc.log.init("bind10")
isc.log.resetUnitTestRootLogger()
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/datasrc/tests/master_test.py b/src/lib/python/isc/datasrc/tests/master_test.py
index c65858e..011a4c2 100644
--- a/src/lib/python/isc/datasrc/tests/master_test.py
+++ b/src/lib/python/isc/datasrc/tests/master_test.py
@@ -32,4 +32,4 @@ class TestTTL(unittest.TestCase):
self.assertFalse(isttl('1X'))
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/datasrc/tests/sqlite3_ds_test.py b/src/lib/python/isc/datasrc/tests/sqlite3_ds_test.py
index 10c61cf..bc338c0 100644
--- a/src/lib/python/isc/datasrc/tests/sqlite3_ds_test.py
+++ b/src/lib/python/isc/datasrc/tests/sqlite3_ds_test.py
@@ -140,4 +140,4 @@ class NewDBFile(unittest.TestCase):
con.close()
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/log/tests/log_test.py b/src/lib/python/isc/log/tests/log_test.py
index 1337654..b948fc5 100644
--- a/src/lib/python/isc/log/tests/log_test.py
+++ b/src/lib/python/isc/log/tests/log_test.py
@@ -201,4 +201,4 @@ class Logger(unittest.TestCase):
self.assertRaises(ValueError, logger.info, self.TEST_MSG, LogParam())
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/net/tests/addr_test.py b/src/lib/python/isc/net/tests/addr_test.py
index bee2118..eccf70e 100644
--- a/src/lib/python/isc/net/tests/addr_test.py
+++ b/src/lib/python/isc/net/tests/addr_test.py
@@ -45,4 +45,4 @@ class TestIPAddr(unittest.TestCase):
self.assertRaises(InvalidAddress, IPAddr, '')
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/net/tests/parse_test.py b/src/lib/python/isc/net/tests/parse_test.py
index ba97da6..094ab71 100644
--- a/src/lib/python/isc/net/tests/parse_test.py
+++ b/src/lib/python/isc/net/tests/parse_test.py
@@ -82,4 +82,4 @@ class TestCheckIP(unittest.TestCase):
self.assertEqual("2001:bd8::", str(addr_parse("2001:bd8::0.0.0.0")))
if __name__ == "__main__":
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/notify/tests/notify_out_test.py b/src/lib/python/isc/notify/tests/notify_out_test.py
index 1b3a4a1..4d23e9a 100644
--- a/src/lib/python/isc/notify/tests/notify_out_test.py
+++ b/src/lib/python/isc/notify/tests/notify_out_test.py
@@ -417,4 +417,4 @@ class TestNotifyOut(unittest.TestCase):
if __name__== "__main__":
isc.log.init("bind10")
isc.log.resetUnitTestRootLogger()
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/server_common/tests/tsig_keyring_test.py b/src/lib/python/isc/server_common/tests/tsig_keyring_test.py
index e9a2174..dbb8568 100644
--- a/src/lib/python/isc/server_common/tests/tsig_keyring_test.py
+++ b/src/lib/python/isc/server_common/tests/tsig_keyring_test.py
@@ -190,4 +190,4 @@ class TSIGKeyRingTest(unittest.TestCase):
if __name__ == "__main__":
isc.log.init("bind10") # FIXME Should this be needed?
isc.log.resetUnitTestRootLogger()
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/util/cio/tests/socketsession_test.py b/src/lib/python/isc/util/cio/tests/socketsession_test.py
index 66b43d5..b1d7ba8 100644
--- a/src/lib/python/isc/util/cio/tests/socketsession_test.py
+++ b/src/lib/python/isc/util/cio/tests/socketsession_test.py
@@ -250,4 +250,4 @@ class TestReceiver(unittest.TestCase):
self.assertRaises(TypeError, SocketSessionReceiver, FakeSocket())
if __name__ == '__main__':
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/util/tests/file_test.py b/src/lib/python/isc/util/tests/file_test.py
index fb765d7..91bbb3e 100644
--- a/src/lib/python/isc/util/tests/file_test.py
+++ b/src/lib/python/isc/util/tests/file_test.py
@@ -29,4 +29,4 @@ class FileTest(unittest.TestCase):
self.assertRaises(IOError, isc.util.file.path_search, 'no file', ['/no/such/directory'])
if __name__ == "__main__":
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/util/tests/process_test.py b/src/lib/python/isc/util/tests/process_test.py
index 5005aa0..d55f3f3 100644
--- a/src/lib/python/isc/util/tests/process_test.py
+++ b/src/lib/python/isc/util/tests/process_test.py
@@ -36,4 +36,4 @@ class TestRename(unittest.TestCase):
self.assertEqual("process_test.py", self.__get_self_name())
if __name__ == "__main__":
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/util/tests/socketserver_mixin_test.py b/src/lib/python/isc/util/tests/socketserver_mixin_test.py
index a6686d8..08751cb 100644
--- a/src/lib/python/isc/util/tests/socketserver_mixin_test.py
+++ b/src/lib/python/isc/util/tests/socketserver_mixin_test.py
@@ -58,6 +58,6 @@ class TestNoPollMixIn(unittest.TestCase):
self.assertTrue(server._is_shut_down.is_set())
if __name__== "__main__":
- unittest.main()
+ unittest.main(verbosity=2)
diff --git a/src/lib/python/isc/xfrin/tests/diff_tests.py b/src/lib/python/isc/xfrin/tests/diff_tests.py
index 7c1158a..165f9af 100644
--- a/src/lib/python/isc/xfrin/tests/diff_tests.py
+++ b/src/lib/python/isc/xfrin/tests/diff_tests.py
@@ -489,4 +489,4 @@ class DiffTest(unittest.TestCase):
if __name__ == "__main__":
isc.log.init("bind10")
isc.log.resetUnitTestRootLogger()
- unittest.main()
+ unittest.main(verbosity=2)
More information about the bind10-changes
mailing list