Browse Source

[qa] Ensure bitcoind processes are cleaned up when tests end

Github-Pull: #12904
Rebased-From: e36a0c08529bccc695ec71a7ec1df89367cc1628
0.16
Suhas Daftuar 7 years ago committed by MarcoFalke
parent
commit
6c26df06ad
  1. 4
      test/functional/feature_help.py
  2. 2
      test/functional/test_framework/test_framework.py
  3. 11
      test/functional/test_framework/test_node.py

4
test/functional/feature_help.py

@ -36,7 +36,11 @@ class HelpTest(BitcoinTestFramework):
output = self.nodes[0].process.stdout.read() output = self.nodes[0].process.stdout.read()
assert b'version' in output assert b'version' in output
self.log.info("Version text received: {} (...)".format(output[0:60])) self.log.info("Version text received: {} (...)".format(output[0:60]))
# Clean up TestNode state
self.nodes[0].running = False self.nodes[0].running = False
self.nodes[0].process = None
self.nodes[0].rpc_connected = False
self.nodes[0].rpc = None
if __name__ == '__main__': if __name__ == '__main__':
HelpTest().main() HelpTest().main()

2
test/functional/test_framework/test_framework.py

@ -145,6 +145,8 @@ class BitcoinTestFramework():
if self.nodes: if self.nodes:
self.stop_nodes() self.stop_nodes()
else: else:
for node in self.nodes:
node.cleanup_on_exit = False
self.log.info("Note: bitcoinds were not stopped and may still be running") self.log.info("Note: bitcoinds were not stopped and may still be running")
if not self.options.nocleanup and not self.options.noshutdown and success != TestStatus.FAILED: if not self.options.nocleanup and not self.options.noshutdown and success != TestStatus.FAILED:

11
test/functional/test_framework/test_node.py

@ -70,9 +70,20 @@ class TestNode():
self.rpc = None self.rpc = None
self.url = None self.url = None
self.log = logging.getLogger('TestFramework.node%d' % i) self.log = logging.getLogger('TestFramework.node%d' % i)
self.cleanup_on_exit = True # Whether to kill the node when this object goes away
self.p2ps = [] self.p2ps = []
def __del__(self):
# Ensure that we don't leave any bitcoind processes lying around after
# the test ends
if self.process and self.cleanup_on_exit:
# Should only happen on test failure
# Avoid using logger, as that may have already been shutdown when
# this destructor is called.
print("Cleaning up leftover process")
self.process.kill()
def __getattr__(self, name): def __getattr__(self, name):
"""Dispatches any unrecognised messages to the RPC connection or a CLI instance.""" """Dispatches any unrecognised messages to the RPC connection or a CLI instance."""
if self.use_cli: if self.use_cli:

Loading…
Cancel
Save