diff options
| author | dexX7 <dexx@bitwatch.co> | 2015-04-20 11:50:33 +0200 |
|---|---|---|
| committer | dexX7 <dexx@bitwatch.co> | 2015-04-20 13:09:29 +0200 |
| commit | 2eadeb27ed40d4dcb252a9d993d3946435f6e22e (patch) | |
| tree | a71ca570ea07dc0dbfec1ce56f38b50d2b7d0863 | |
| parent | 8f955b9661224adc950e302b42d2f7bcb5e90bef (diff) | |
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.
| -rwxr-xr-x | qa/rpc-tests/test_framework.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qa/rpc-tests/test_framework.py b/qa/rpc-tests/test_framework.py index 4c8a11b821..8de7a4b5e4 100755 --- a/qa/rpc-tests/test_framework.py +++ b/qa/rpc-tests/test_framework.py @@ -128,10 +128,12 @@ class BitcoinTestFramework(object): print("Unexpected exception caught during testing: "+str(e)) traceback.print_tb(sys.exc_info()[2]) + print("Stopping nodes") + stop_nodes(self.nodes) + wait_bitcoinds() + if not self.options.nocleanup: print("Cleaning up") - stop_nodes(self.nodes) - wait_bitcoinds() shutil.rmtree(self.options.tmpdir) if success: |