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.
TrezarCoin · Apr 20, 2015 · 2eadeb2 · 2eadeb2
1 parent 8f955b9
commit 2eadeb2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/qa/rpc-tests/test_framework.py b/qa/rpc-tests/test_framework.py
@@ -128,10 +128,12 @@ def main(self):
             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: