This reverts commit 6a9dbeff7d28a8ef91ceddff5dbcdef9a7d1452e. Most builder systems use Python 3.1. This verbosity feature was added in Python 3.2.
@@ -154,4 +154,4 @@ class TestBossArgs(unittest.TestCase):
bob.wait()
if __name__ == '__main__':
- unittest.main(verbosity=2)
+ unittest.main()
@@ -1467,4 +1467,4 @@ if __name__ == '__main__':
# store os.environ for test_unchanged_environment
original_os_environ = copy.deepcopy(os.environ)
isc.log.resetUnitTestRootLogger()
@@ -470,5 +470,5 @@ class TestCommandLineOptions(unittest.TestCase):
['--csv-file-dir'])
if __name__== "__main__":
@@ -84,5 +84,5 @@ class TestCmdParse(unittest.TestCase):
@@ -132,4 +132,4 @@ class LoggingConfCheckTest(unittest.TestCase):
'severity': 123}]}))
@@ -100,4 +100,4 @@ class TSigKeysTest(unittest.TestCase):
self.assertNotEqual(None, tsig_keys.check({'keys': {}}))
@@ -201,5 +201,5 @@ class TestParseArgs(unittest.TestCase):
@@ -483,6 +483,6 @@ class TestFuncNotInClass(unittest.TestCase):
@@ -416,4 +416,4 @@ class TestMain(unittest.TestCase):
@@ -68,4 +68,4 @@ class TestDhcpv6Daemon(unittest.TestCase):
print("Ignoring failed kill attempt. Process is dead already.")
@@ -234,4 +234,4 @@ class SendNonblock(unittest.TestCase):
self.send_many(data)
@@ -1326,4 +1326,4 @@ class TestStatsHttpd(unittest.TestCase):
imp.reload(stats_httpd)
if __name__ == "__main__":
@@ -912,7 +912,7 @@ class TestOSEnv(unittest.TestCase):
imp.reload(stats)
def test_main():
test_main()
@@ -61,4 +61,4 @@ class TestRename(unittest.TestCase):
self.__scan(d, script, fun)
@@ -2848,6 +2848,6 @@ class TestXfrinTransferStats(unittest.TestCase):
try:
except KeyboardInterrupt as e:
print(e)
@@ -1472,4 +1472,4 @@ class TestXfroutServer(unittest.TestCase):
@@ -696,4 +696,4 @@ class TestZonemgr(unittest.TestCase):
@@ -174,4 +174,4 @@ class EDNSTest(unittest.TestCase):
self.rrttl_badver, self.opt_rdata)
@@ -624,4 +624,4 @@ test.example.com. 3600 IN A 192.0.2.2
self.p, "message_fromWire16.wire")
@@ -117,4 +117,4 @@ class MessageRendererTest(unittest.TestCase):
self.assertRaises(TypeError, renderer.set_compress_mode, "wrong")
@@ -219,4 +219,4 @@ class NameTest(unittest.TestCase):
self.assertFalse(self.name2 >= self.name1)
@@ -125,4 +125,4 @@ class NSEC3HashTest(unittest.TestCase):
Rdata(RRType.A(), RRClass.IN(), "192.0.2.1"))
@@ -109,4 +109,4 @@ class OpcodeTest(unittest.TestCase):
self.assertEqual(TypeError, type(err))
@@ -98,4 +98,4 @@ class QuestionTest(unittest.TestCase):
self.assertEqual(0, renderer.get_length())
@@ -141,4 +141,4 @@ class RcodeTest(unittest.TestCase):
@@ -92,4 +92,4 @@ class RdataTest(unittest.TestCase):
@@ -86,4 +86,4 @@ class RRClassTest(unittest.TestCase):
self.assertEqual(255, RRClass.ANY().get_code())
@@ -119,4 +119,4 @@ class TestModuleSpec(unittest.TestCase):
self.assertEqual(1, sys.getrefcount(self.rrset_a.get_rdata()[0]))
@@ -80,4 +80,4 @@ class RRTTLTest(unittest.TestCase):
self.assertTrue(self.t1 <= self.t2)
@@ -141,4 +141,4 @@ class TestModuleSpec(unittest.TestCase):
self.assertEqual(255, RRType.ANY().get_code())
@@ -108,4 +108,4 @@ class SerialTest(unittest.TestCase):
self.assertRaises(TypeError, lambda: "bad" + self.zero)
@@ -551,4 +551,4 @@ class TSIGContextTest(unittest.TestCase):
TSIGContext.STATE_RECEIVED_REQUEST)
@@ -27,4 +27,4 @@ class TSIGRdataTest(unittest.TestCase):
self.assertEqual(1, sys.getrefcount(tsig.get_algorithm()))
@@ -94,4 +94,4 @@ class TSIGErrorTest(unittest.TestCase):
self.assertEqual(1, sys.getrefcount(TSIGError.BAD_SIG.to_rcode()))
@@ -209,4 +209,4 @@ class TSIGKeyRingTest(unittest.TestCase):
self.sha1_name))
@@ -41,4 +41,4 @@ class TSIGRecordTest(unittest.TestCase):
self.assertEqual(expected_text, str(self.test_record))
@@ -26,4 +26,4 @@ class ACLTest(unittest.TestCase):
self.assertTrue(DROP != ACCEPT)
@@ -354,4 +354,4 @@ class RequestLoaderTest(unittest.TestCase):
self.assertRaises(Error, RequestLoader)
@@ -1057,4 +1057,4 @@ class ConfiguratorTest(BossUtils, unittest.TestCase):
isc.log.init("bind10") # FIXME Should this be needed?
@@ -321,4 +321,4 @@ class WrapTests(unittest.TestCase):
@@ -393,4 +393,4 @@ class SocketCacheTest(Test):
isc.log.init("bind10")
@@ -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)
@@ -54,6 +54,6 @@ class MessageTest(unittest.TestCase):
self.assertRaises(ValueError, isc.cc.message.from_wire, b']')
@@ -409,5 +409,5 @@ class testSession(unittest.TestCase):
os.remove(TEST_SOCKET_FILE)
@@ -57,4 +57,4 @@ class TestCCWireEncoding(unittest.TestCase):
self.assertEqual(env["instance"], "i4")
@@ -1108,5 +1108,5 @@ class TestUIModuleCCSession(unittest.TestCase):
@@ -626,4 +626,4 @@ if __name__ == '__main__':
exit(1)
isc.log.init("unittests")
@@ -698,5 +698,5 @@ class TestMultiConfigData(unittest.TestCase):
], config_items)
@@ -442,4 +442,4 @@ class TestModuleSpec(unittest.TestCase):
@@ -893,4 +893,4 @@ class JournalRead(unittest.TestCase):
@@ -32,4 +32,4 @@ class TestTTL(unittest.TestCase):
self.assertFalse(isttl('1X'))
@@ -140,4 +140,4 @@ class NewDBFile(unittest.TestCase):
con.close()
@@ -201,4 +201,4 @@ class Logger(unittest.TestCase):
self.assertRaises(ValueError, logger.info, self.TEST_MSG, LogParam())
@@ -45,4 +45,4 @@ class TestIPAddr(unittest.TestCase):
self.assertRaises(InvalidAddress, IPAddr, '')
@@ -82,4 +82,4 @@ class TestCheckIP(unittest.TestCase):
self.assertEqual("2001:bd8::", str(addr_parse("2001:bd8::0.0.0.0")))
@@ -417,4 +417,4 @@ class TestNotifyOut(unittest.TestCase):
@@ -190,4 +190,4 @@ class TSIGKeyRingTest(unittest.TestCase):
@@ -250,4 +250,4 @@ class TestReceiver(unittest.TestCase):
self.assertRaises(TypeError, SocketSessionReceiver, FakeSocket())
@@ -29,4 +29,4 @@ class FileTest(unittest.TestCase):
self.assertRaises(IOError, isc.util.file.path_search, 'no file', ['/no/such/directory'])
@@ -36,4 +36,4 @@ class TestRename(unittest.TestCase):
self.assertEqual("process_test.py", self.__get_self_name())
@@ -58,6 +58,6 @@ class TestNoPollMixIn(unittest.TestCase):
self.assertTrue(server._is_shut_down.is_set())
@@ -489,4 +489,4 @@ class DiffTest(unittest.TestCase):