Commit fe5549bb authored by Jeremy C. Reed's avatar Jeremy C. Reed
Browse files

[master]Revert "[master] Show testnames when running Python unit tests"

This reverts commit 6a9dbeff.

Most builder systems use Python 3.1.

This verbosity feature was added in Python 3.2.
parent 6a9dbeff
......@@ -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()
unittest.main(verbosity=2)
unittest.main()
......@@ -470,5 +470,5 @@ class TestCommandLineOptions(unittest.TestCase):
['--csv-file-dir'])
if __name__== "__main__":
unittest.main(verbosity=2)
unittest.main()
......@@ -84,5 +84,5 @@ class TestCmdParse(unittest.TestCase):
if __name__== "__main__":
unittest.main(verbosity=2)
unittest.main()
......@@ -132,4 +132,4 @@ class LoggingConfCheckTest(unittest.TestCase):
'severity': 123}]}))
if __name__ == '__main__':
unittest.main(verbosity=2)
unittest.main()
......@@ -100,4 +100,4 @@ class TSigKeysTest(unittest.TestCase):
self.assertNotEqual(None, tsig_keys.check({'keys': {}}))
if __name__ == '__main__':
unittest.main(verbosity=2)
unittest.main()
......@@ -201,5 +201,5 @@ class TestParseArgs(unittest.TestCase):
if __name__ == '__main__':
unittest.main(verbosity=2)
unittest.main()
......@@ -483,6 +483,6 @@ class TestFuncNotInClass(unittest.TestCase):
if __name__== "__main__":
isc.log.resetUnitTestRootLogger()
unittest.main(verbosity=2)
unittest.main()
......@@ -416,4 +416,4 @@ class TestMain(unittest.TestCase):
if __name__== "__main__":
isc.log.resetUnitTestRootLogger()
unittest.main(verbosity=2)
unittest.main()
......@@ -68,4 +68,4 @@ class TestDhcpv6Daemon(unittest.TestCase):
print("Ignoring failed kill attempt. Process is dead already.")
if __name__ == '__main__':
unittest.main(verbosity=2)
unittest.main()
......@@ -234,4 +234,4 @@ class SendNonblock(unittest.TestCase):
self.send_many(data)
if __name__ == '__main__':
unittest.main(verbosity=2)
unittest.main()
......@@ -1326,4 +1326,4 @@ class TestStatsHttpd(unittest.TestCase):
imp.reload(stats_httpd)
if __name__ == "__main__":
unittest.main(verbosity=2)
unittest.main()
......@@ -912,7 +912,7 @@ class TestOSEnv(unittest.TestCase):
imp.reload(stats)
def test_main():
unittest.main(verbosity=2)
unittest.main()
if __name__ == "__main__":
test_main()
......@@ -61,4 +61,4 @@ class TestRename(unittest.TestCase):
self.__scan(d, script, fun)
if __name__ == "__main__":
unittest.main(verbosity=2)
unittest.main()
......@@ -2848,6 +2848,6 @@ class TestXfrinTransferStats(unittest.TestCase):
if __name__== "__main__":
try:
isc.log.resetUnitTestRootLogger()
unittest.main(verbosity=2)
unittest.main()
except KeyboardInterrupt as e:
print(e)
......@@ -1472,4 +1472,4 @@ class TestXfroutServer(unittest.TestCase):
if __name__== "__main__":
isc.log.resetUnitTestRootLogger()
unittest.main(verbosity=2)
unittest.main()
......@@ -696,4 +696,4 @@ class TestZonemgr(unittest.TestCase):
if __name__== "__main__":
isc.log.resetUnitTestRootLogger()
unittest.main(verbosity=2)
unittest.main()
......@@ -174,4 +174,4 @@ class EDNSTest(unittest.TestCase):
self.rrttl_badver, self.opt_rdata)
if __name__ == '__main__':
unittest.main(verbosity=2)
unittest.main()
......@@ -624,4 +624,4 @@ test.example.com. 3600 IN A 192.0.2.2
self.p, "message_fromWire16.wire")
if __name__ == '__main__':
unittest.main(verbosity=2)
unittest.main()
......@@ -117,4 +117,4 @@ class MessageRendererTest(unittest.TestCase):
self.assertRaises(TypeError, renderer.set_compress_mode, "wrong")
if __name__ == '__main__':
unittest.main(verbosity=2)
unittest.main()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment