QA: stop nodes after RPC tests, even with --nocleanup

`--nocleanup` should provide a way to preserve test data, but should not have an impact on whether nodes are to be stopped after the test execution.

In particular, when currently running RPC tests with `--nocleanup`, then it may result in several active `bitcoind` processes, which are not terminated properly.
This commit is contained in:
dexX7 2015-04-20 11:50:33 +02:00
parent 8f955b9661
commit 2eadeb27ed
No known key found for this signature in database
GPG key ID: 7675E31CF5719832

View file

@ -128,10 +128,12 @@ class BitcoinTestFramework(object):
print("Unexpected exception caught during testing: "+str(e)) print("Unexpected exception caught during testing: "+str(e))
traceback.print_tb(sys.exc_info()[2]) traceback.print_tb(sys.exc_info()[2])
print("Stopping nodes")
stop_nodes(self.nodes)
wait_bitcoinds()
if not self.options.nocleanup: if not self.options.nocleanup:
print("Cleaning up") print("Cleaning up")
stop_nodes(self.nodes)
wait_bitcoinds()
shutil.rmtree(self.options.tmpdir) shutil.rmtree(self.options.tmpdir)
if success: if success: