aboutsummaryrefslogtreecommitdiff
path: root/qa/rpc-tests/test_framework/test_framework.py
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2016-04-27 22:29:52 +0200
committerMarcoFalke <falke.marco@gmail.com>2016-05-06 12:43:34 +0200
commitfabbf6bd62c1d8a290841b63fb1e5acec42ba3b0 (patch)
tree3f4a6a90e0d7db5d13ce126b3d854537c29409e2 /qa/rpc-tests/test_framework/test_framework.py
parent77b637f20e8cb91cf007bf416b603ca362385cdb (diff)
downloadbitcoin-fabbf6bd62c1d8a290841b63fb1e5acec42ba3b0.tar.xz
[qa] Refactor test_framework and pull tester
* log to stdout * increase range for p2p and rpc ports * UPPERCASE_CONSTANTS * Stop nodes on CTRL+C
Diffstat (limited to 'qa/rpc-tests/test_framework/test_framework.py')
-rwxr-xr-xqa/rpc-tests/test_framework/test_framework.py4
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 ed12e1efb6..103d9a068a 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")