Skip to content

Commit 2eadeb2

Browse files
committed
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.
1 parent 8f955b9 commit 2eadeb2

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

qa/rpc-tests/test_framework.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,12 @@ def main(self):
128128
print("Unexpected exception caught during testing: "+str(e))
129129
traceback.print_tb(sys.exc_info()[2])
130130

131+
print("Stopping nodes")
132+
stop_nodes(self.nodes)
133+
wait_bitcoinds()
134+
131135
if not self.options.nocleanup:
132136
print("Cleaning up")
133-
stop_nodes(self.nodes)
134-
wait_bitcoinds()
135137
shutil.rmtree(self.options.tmpdir)
136138

137139
if success:

0 commit comments

Comments
 (0)