aboutsummaryrefslogtreecommitdiff
path: root/qa/rpc-tests/skeleton.py
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2014-03-13 17:51:05 -0400
committerWladimir J. van der Laan <laanwj@gmail.com>2014-03-24 19:14:51 +0100
commitd138598f63cc980c1333e7c63a95b19e6b279025 (patch)
tree6cb03d8cacb23eca0979e4d3bfab888c4b056780 /qa/rpc-tests/skeleton.py
parentd3c3210fa376a9c1ce55c537a3f4439202783624 (diff)
Fix regression tests
Taught bitcoind to close the HTTP connection after it gets a 'stop' command, to make it easier for the regression tests to cleanly stop. Move bitcoinrpc files to correct location. Tidied up the python-based regression tests.
Diffstat (limited to 'qa/rpc-tests/skeleton.py')
-rwxr-xr-xqa/rpc-tests/skeleton.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/qa/rpc-tests/skeleton.py b/qa/rpc-tests/skeleton.py
index 5d4b62e55f..126b6bfaf4 100755
--- a/qa/rpc-tests/skeleton.py
+++ b/qa/rpc-tests/skeleton.py
@@ -45,6 +45,7 @@ def main():
check_json_precision()
success = False
+ nodes = []
try:
print("Initializing test directory "+options.tmpdir)
if not os.path.isdir(options.tmpdir):
@@ -63,12 +64,12 @@ def main():
print("Assertion failed: "+e.message)
except Exception as e:
print("Unexpected exception caught during testing: "+str(e))
- stack = traceback.extract_tb(sys.exc_info()[2])
- print(stack[-1])
+ traceback.print_tb(sys.exc_info()[2])
if not options.nocleanup:
print("Cleaning up")
- stop_nodes()
+ stop_nodes(nodes)
+ wait_bitcoinds()
shutil.rmtree(options.tmpdir)
if success: