diff options
author | MarcoFalke <falke.marco@gmail.com> | 2016-05-09 17:01:55 +0200 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2016-05-09 17:06:44 +0200 |
commit | 4e14afe42fdd468d5de11df8cc13defdcb8e83f8 (patch) | |
tree | 4ebc19ab84c65fe2e161413ad8ae82dea6906986 /qa/rpc-tests/test_framework/test_framework.py | |
parent | 3e90fe6534206412ea22beaa445cf20d28fbe718 (diff) | |
parent | fad336648c848c7a4b3e32bae68ea9a22f97e668 (diff) | |
download | bitcoin-4e14afe42fdd468d5de11df8cc13defdcb8e83f8.tar.xz |
Merge #7971: [qa] Refactor test_framework and pull tester
fad3366 [qa] pull-tester: Adjust comment (MarcoFalke)
fafb33c [qa] Stop other nodes, even when one fails to stop (MarcoFalke)
2222dae [qa] Update README.md (MarcoFalke)
fabbf6b [qa] Refactor test_framework and pull tester (MarcoFalke)
Diffstat (limited to 'qa/rpc-tests/test_framework/test_framework.py')
-rwxr-xr-x | qa/rpc-tests/test_framework/test_framework.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py index 0b6d1b6abc..4e72463096 100755 --- a/qa/rpc-tests/test_framework/test_framework.py +++ b/qa/rpc-tests/test_framework/test_framework.py @@ -115,7 +115,7 @@ class BitcoinTestFramework(object): if self.options.trace_rpc: import logging - logging.basicConfig(level=logging.DEBUG) + logging.basicConfig(level=logging.DEBUG, stream=sys.stdout) if self.options.coveragedir: enable_coverage(self.options.coveragedir) @@ -148,6 +148,8 @@ class BitcoinTestFramework(object): except Exception as e: print("Unexpected exception caught during testing: " + repr(e)) traceback.print_tb(sys.exc_info()[2]) + except KeyboardInterrupt as e: + print("Exiting after " + repr(e)) if not self.options.noshutdown: print("Stopping nodes") |