diff options
| author | dexX7 <dexx@bitwatch.co> | 2015-04-23 14:19:00 +0200 |
|---|---|---|
| committer | dexX7 <dexx@bitwatch.co> | 2015-04-23 14:19:00 +0200 |
| commit | 688da79e4a9e262d7aa643cb0f9b46c7781ac655 (patch) | |
| tree | d51bbb07d3fd29de7187334129003b7b21468dc2 /qa | |
| parent | 2eadeb27ed40d4dcb252a9d993d3946435f6e22e (diff) | |
| download | bitcoin-688da79e4a9e262d7aa643cb0f9b46c7781ac655.tar.xz | |
QA: add --noshutdown option to prevent stopping nodes
With `--noshutdown`, the nodes are not stopped explicitly. `--noshutdown` implies `--nocleanup`, to prevent removing datadirs, which are still in use.
Diffstat (limited to 'qa')
| -rwxr-xr-x | qa/rpc-tests/test_framework.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/qa/rpc-tests/test_framework.py b/qa/rpc-tests/test_framework.py index 8de7a4b5e4..6f3cc19dda 100755 --- a/qa/rpc-tests/test_framework.py +++ b/qa/rpc-tests/test_framework.py @@ -89,8 +89,10 @@ class BitcoinTestFramework(object): parser = optparse.OptionParser(usage="%prog [options]") parser.add_option("--nocleanup", dest="nocleanup", default=False, action="store_true", help="Leave bitcoinds and test.* datadir on exit or error") + parser.add_option("--noshutdown", dest="noshutdown", default=False, action="store_true", + help="Don't stop bitcoinds after the test execution") parser.add_option("--srcdir", dest="srcdir", default="../../src", - help="Source directory containing bitcoind/bitcoin-cli (default: %default%)") + help="Source directory containing bitcoind/bitcoin-cli (default: %default)") parser.add_option("--tmpdir", dest="tmpdir", default=tempfile.mkdtemp(prefix="test"), help="Root directory for datadirs") parser.add_option("--tracerpc", dest="trace_rpc", default=False, action="store_true", @@ -128,11 +130,14 @@ 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.noshutdown: + print("Stopping nodes") + stop_nodes(self.nodes) + wait_bitcoinds() + else: + print("Note: bitcoinds were not stopped and may still be running") - if not self.options.nocleanup: + if not self.options.nocleanup and not self.options.noshutdown: print("Cleaning up") shutil.rmtree(self.options.tmpdir) |