[tests] Improve logging shutdown and add hint for combine_logs

This commit is contained in:
John Newbery 2017-11-29 13:21:51 -05:00
parent 32c9b570fc
commit bba1c54edd

View file

@ -167,14 +167,16 @@ class BitcoinTestFramework():
if success == TestStatus.PASSED:
self.log.info("Tests successful")
sys.exit(TEST_EXIT_PASSED)
exit_code = TEST_EXIT_PASSED
elif success == TestStatus.SKIPPED:
self.log.info("Test skipped")
sys.exit(TEST_EXIT_SKIPPED)
exit_code = TEST_EXIT_SKIPPED
else:
self.log.error("Test failed. Test logging available at %s/test_framework.log", self.options.tmpdir)
self.log.error("Hint: Call {} '{}' to consolidate all logs".format(os.path.normpath(os.path.dirname(os.path.realpath(__file__)) + "/../combine_logs.py"), self.options.tmpdir))
exit_code = TEST_EXIT_FAILED
logging.shutdown()
sys.exit(TEST_EXIT_FAILED)
sys.exit(exit_code)
# Methods to override in subclass test scripts.
def set_test_params(self):