From fada8966c51b49bdb68549039cf67ddb4b44421c Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Fri, 3 Aug 2018 13:43:59 -0400 Subject: [PATCH 1/4] qa: Close stdout and stderr file when node stops --- test/functional/test_framework/test_node.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py index 8ae7677f3..81ca156f8 100755 --- a/test/functional/test_framework/test_node.py +++ b/test/functional/test_framework/test_node.py @@ -200,6 +200,9 @@ class TestNode(): if stderr != expected_stderr: raise AssertionError("Unexpected stderr {} != {}".format(stderr, expected_stderr)) + self.stdout.close() + self.stderr.close() + del self.p2ps[:] def is_node_stopped(self): From facb56ffaff2e56d84a7626491b0363f13f26d0e Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Fri, 3 Aug 2018 16:30:15 -0400 Subject: [PATCH 2/4] qa: Run gen_rpcauth with sys.executable --- test/functional/rpc_users.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/functional/rpc_users.py b/test/functional/rpc_users.py index 62d86467f..9af7b85d5 100755 --- a/test/functional/rpc_users.py +++ b/test/functional/rpc_users.py @@ -18,6 +18,7 @@ import subprocess from random import SystemRandom import string import configparser +import sys class HTTPBasicsTest(BitcoinTestFramework): @@ -36,7 +37,7 @@ class HTTPBasicsTest(BitcoinTestFramework): config = configparser.ConfigParser() config.read_file(open(self.options.configfile)) gen_rpcauth = config['environment']['RPCAUTH'] - p = subprocess.Popen([gen_rpcauth, self.user], stdout=subprocess.PIPE, universal_newlines=True) + p = subprocess.Popen([sys.executable, gen_rpcauth, self.user], stdout=subprocess.PIPE, universal_newlines=True) lines = p.stdout.read().splitlines() rpcauth3 = lines[1] self.password = lines[3] From faabd7bc47ca8e1466abb6967a8d1ea43fd0acc3 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Fri, 3 Aug 2018 17:23:33 -0400 Subject: [PATCH 3/4] qa: Use files for stdout/stderr to support Windows --- test/functional/feature_help.py | 63 +++++++++++---------- test/functional/test_framework/test_node.py | 4 +- 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/test/functional/feature_help.py b/test/functional/feature_help.py index d38275a9c..1adafc21a 100755 --- a/test/functional/feature_help.py +++ b/test/functional/feature_help.py @@ -3,7 +3,6 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Verify that starting bitcoin with -h works as expected.""" -import subprocess from test_framework.test_framework import BitcoinTestFramework from test_framework.util import assert_equal @@ -17,35 +16,15 @@ class HelpTest(BitcoinTestFramework): self.add_nodes(self.num_nodes) # Don't start the node - def run_test(self): - self.log.info("Start bitcoin with -h for help text") - self.nodes[0].start(extra_args=['-h'], stderr=subprocess.PIPE, stdout=subprocess.PIPE) - # Node should exit immediately and output help to stdout. + def get_node_output(self, *, ret_code_expected): ret_code = self.nodes[0].process.wait(timeout=1) - assert_equal(ret_code, 0) - output = self.nodes[0].process.stdout.read() - assert b'Options' in output - self.log.info("Help text received: {} (...)".format(output[0:60])) - self.nodes[0].running = False - - self.log.info("Start bitcoin with -version for version information") - self.nodes[0].start(extra_args=['-version'], stderr=subprocess.PIPE, stdout=subprocess.PIPE) - # Node should exit immediately and output version to stdout. - ret_code = self.nodes[0].process.wait(timeout=1) - assert_equal(ret_code, 0) - output = self.nodes[0].process.stdout.read() - assert b'version' in output - self.log.info("Version text received: {} (...)".format(output[0:60])) - - # Test that arguments not in the help results in an error - self.log.info("Start bitcoind with -fakearg to make sure it does not start") - self.nodes[0].start(extra_args=['-fakearg'], stderr=subprocess.PIPE, stdout=subprocess.PIPE) - # Node should exit immediately and output an error to stderr - ret_code = self.nodes[0].process.wait(timeout=1) - assert_equal(ret_code, 1) - output = self.nodes[0].process.stderr.read() - assert b'Error parsing command line arguments' in output - self.log.info("Error message received: {} (...)".format(output[0:60])) + assert_equal(ret_code, ret_code_expected) + self.nodes[0].stdout.seek(0) + self.nodes[0].stderr.seek(0) + out = self.nodes[0].stdout.read() + err = self.nodes[0].stderr.read() + self.nodes[0].stdout.close() + self.nodes[0].stderr.close() # Clean up TestNode state self.nodes[0].running = False @@ -53,5 +32,31 @@ class HelpTest(BitcoinTestFramework): self.nodes[0].rpc_connected = False self.nodes[0].rpc = None + return out, err + + def run_test(self): + self.log.info("Start bitcoin with -h for help text") + self.nodes[0].start(extra_args=['-h']) + # Node should exit immediately and output help to stdout. + output, _ = self.get_node_output(ret_code_expected=0) + assert b'Options' in output + self.log.info("Help text received: {} (...)".format(output[0:60])) + + self.log.info("Start bitcoin with -version for version information") + self.nodes[0].start(extra_args=['-version']) + # Node should exit immediately and output version to stdout. + output, _ = self.get_node_output(ret_code_expected=0) + assert b'version' in output + self.log.info("Version text received: {} (...)".format(output[0:60])) + + # Test that arguments not in the help results in an error + self.log.info("Start bitcoind with -fakearg to make sure it does not start") + self.nodes[0].start(extra_args=['-fakearg']) + # Node should exit immediately and output an error to stderr + _, output = self.get_node_output(ret_code_expected=1) + assert b'Error parsing command line arguments' in output + self.log.info("Error message received: {} (...)".format(output[0:60])) + + if __name__ == '__main__': HelpTest().main() diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py index 81ca156f8..7bf5f5f0d 100755 --- a/test/functional/test_framework/test_node.py +++ b/test/functional/test_framework/test_node.py @@ -122,7 +122,7 @@ class TestNode(): assert self.rpc_connected and self.rpc is not None, self._node_msg("Error: no RPC connection") return getattr(self.rpc, name) - def start(self, extra_args=None, stdout=None, stderr=None, *args, **kwargs): + def start(self, extra_args=None, *, stdout=None, stderr=None, **kwargs): """Start the node.""" if extra_args is None: extra_args = self.extra_args @@ -143,7 +143,7 @@ class TestNode(): # add environment variable LIBC_FATAL_STDERR_=1 so that libc errors are written to stderr and not the terminal subp_env = dict(os.environ, LIBC_FATAL_STDERR_="1") - self.process = subprocess.Popen(self.args + extra_args, env=subp_env, stdout=stdout, stderr=stderr, *args, **kwargs) + self.process = subprocess.Popen(self.args + extra_args, env=subp_env, stdout=stdout, stderr=stderr, **kwargs) self.running = True self.log.debug("bitcoind started, waiting for RPC to come up") From fafe73a626d9d935402e3d488c07cc36a57b1850 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Fri, 3 Aug 2018 17:50:33 -0400 Subject: [PATCH 4/4] qa: Raise feature_help timeout to 5s --- test/functional/feature_help.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/feature_help.py b/test/functional/feature_help.py index 1adafc21a..ed1d25c0d 100755 --- a/test/functional/feature_help.py +++ b/test/functional/feature_help.py @@ -17,7 +17,7 @@ class HelpTest(BitcoinTestFramework): # Don't start the node def get_node_output(self, *, ret_code_expected): - ret_code = self.nodes[0].process.wait(timeout=1) + ret_code = self.nodes[0].process.wait(timeout=5) assert_equal(ret_code, ret_code_expected) self.nodes[0].stdout.seek(0) self.nodes[0].stderr.seek(0)