No OneTemporary
Actions

Size

31 KB

Subscribers

None

View Options

	diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
	index 0b0552f85..80f1a6c8c 100755
	--- a/test/functional/test_framework/test_framework.py
	+++ b/test/functional/test_framework/test_framework.py
	@@ -1,267 +1,269 @@
	#!/usr/bin/env python3
	# Copyright (c) 2014-2016 The Bitcoin Core developers
	# Distributed under the MIT software license, see the accompanying
	# file COPYING or http://www.opensource.org/licenses/mit-license.php.

	# Base class for RPC testing

	import logging
	import optparse
	import os
	import sys
	import shutil
	import tempfile
	import traceback

	from .util import (
	initialize_chain,
	start_nodes,
	connect_nodes_bi,
	disconnect_nodes,
	sync_blocks,
	sync_mempools,
	stop_nodes,
	stop_node,
	enable_coverage,
	check_json_precision,
	initialize_chain_clean,
	PortSeed,
	)
	from .authproxy import JSONRPCException
	from .outputchecker import OutputChecker


	class BitcoinTestFramework(object):

	def __init__(self):
	self.num_nodes = 4
	self.setup_clean_chain = False
	self.nodes = None

	def run_test(self):
	raise NotImplementedError

	def add_options(self, parser):
	pass

	def setup_chain(self):
	self.log.info("Initializing test directory " + self.options.tmpdir)
	if self.setup_clean_chain:
	initialize_chain_clean(self.options.tmpdir, self.num_nodes)
	else:
	initialize_chain(
	self.options.tmpdir, self.num_nodes, self.options.cachedir)

	def stop_node(self, num_node):
	stop_node(self.nodes[num_node], num_node)

	def setup_nodes(self):
	'''
	Starts up the nodes.
	'''
	extra_args = None
	if hasattr(self, "extra_args"):
	extra_args = self.extra_args
	self.nodes = start_nodes(
	self.num_nodes, self.options.tmpdir, extra_args)

	def setup_network(self):
	'''
	Sets up network including starting up nodes.
	'''
	self.setup_nodes()

	# Connect the nodes as a "chain". This allows us
	# to split the network between nodes 1 and 2 to get
	# two halves that can work on competing chains.

	for i in range(self.num_nodes - 1):
	connect_nodes_bi(self.nodes, i, i + 1)
	self.sync_all()

	def split_network(self):
	"""
	Split the network of four nodes into nodes 0/1 and 2/3.
	"""
	disconnect_nodes(self.nodes[1], 2)
	disconnect_nodes(self.nodes[2], 1)
	self.sync_all([self.nodes[:2], self.nodes[2:]])

	def sync_all(self, node_groups=None):
	if not node_groups:
	node_groups = [self.nodes]

	[sync_blocks(group) for group in node_groups]
	[sync_mempools(group) for group in node_groups]

	def join_network(self):
	"""
	Join the (previously split) network halves together.
	"""
	connect_nodes_bi(self.nodes, 1, 2)
	self.sync_all()

	def main(self):

	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=os.path.normpath(os.path.dirname(os.path.realpath(__file__)) + "/../../../src"),
	help="Source directory containing bitcoind/bitcoin-cli (default: %default)")
	parser.add_option(
	"--cachedir", dest="cachedir", default=os.path.normpath(os.path.dirname(os.path.realpath(__file__)) + "/../../cache"),
	help="Directory for caching pregenerated datadirs")
	parser.add_option(
	"--tmpdir", dest="tmpdir", default=tempfile.mkdtemp(prefix="test"),
	help="Root directory for datadirs")
	parser.add_option("-l", "--loglevel", dest="loglevel", default="INFO",
	help="log events at this level and higher to the console. Can be set to DEBUG, INFO, WARNING, ERROR or CRITICAL. Passing --loglevel DEBUG will output all logs to console. Note that logs at all levels are always written to the test_framework.log file in the temporary test directory.")
	parser.add_option(
	"--tracerpc", dest="trace_rpc", default=False, action="store_true",
	help="Print out all RPC calls as they are made")
	parser.add_option(
	"--portseed", dest="port_seed", default=os.getpid(), type='int',
	help="The seed to use for assigning port numbers (default: current process id)")
	parser.add_option("--coveragedir", dest="coveragedir",
	help="Write tested RPC commands into this directory")
	+ parser.add_option("--configfile", dest="configfile",
	+ help="Location of the test framework config file")
	self.add_options(parser)
	(self.options, self.args) = parser.parse_args()

	# backup dir variable for removal at cleanup
	self.options.root, self.options.tmpdir = self.options.tmpdir, self.options.tmpdir + \
	'/' + str(self.options.port_seed)

	if self.options.coveragedir:
	enable_coverage(self.options.coveragedir)

	PortSeed.n = self.options.port_seed

	os.environ['PATH'] = self.options.srcdir + ":" + \
	self.options.srcdir + "/qt:" + os.environ['PATH']

	check_json_precision()

	# Set up temp directory and start logging
	os.makedirs(self.options.tmpdir, exist_ok=False)
	self._start_logging()

	success = False

	try:
	self.setup_chain()
	self.setup_network()
	self.run_test()
	success = True
	except JSONRPCException as e:
	self.log.exception("JSONRPC error")
	except AssertionError as e:
	self.log.exception("Assertion failed")
	except KeyError as e:
	self.log.exception("Key error")
	except Exception as e:
	self.log.exception("Unexpected exception caught during testing")
	except KeyboardInterrupt as e:
	self.log.warning("Exiting after keyboard interrupt")

	if not self.options.noshutdown:
	self.log.info("Stopping nodes")
	stop_nodes(self.nodes)
	else:
	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:
	self.log.info("Cleaning up")
	shutil.rmtree(self.options.tmpdir)
	if not os.listdir(self.options.root):
	os.rmdir(self.options.root)
	else:
	self.log.warning("Not cleaning up dir %s" % self.options.tmpdir)
	if os.getenv("PYTHON_DEBUG", ""):
	# Dump the end of the debug logs, to aid in debugging rare
	# travis failures.
	import glob
	filenames = glob.glob(
	self.options.tmpdir + "/node*/regtest/debug.log")
	MAX_LINES_TO_PRINT = 1000
	for f in filenames:
	print("From", f, ":")
	from collections import deque
	print("".join(deque(open(f), MAX_LINES_TO_PRINT)))
	if success:
	self.log.info("Tests successful")
	sys.exit(0)
	else:
	self.log.error(
	"Test failed. Test logging available at %s/test_framework.log", self.options.tmpdir)
	logging.shutdown()
	sys.exit(1)

	def _start_logging(self):
	# Add logger and logging handlers
	self.log = logging.getLogger('TestFramework')
	self.log.setLevel(logging.DEBUG)
	# Create file handler to log all messages
	fh = logging.FileHandler(self.options.tmpdir + '/test_framework.log')
	fh.setLevel(logging.DEBUG)
	# Create console handler to log messages to stderr. By default this
	# logs only error messages, but can be configured with --loglevel.
	ch = logging.StreamHandler(sys.stdout)
	# User can provide log level as a number or string (eg DEBUG). loglevel
	# was caught as a string, so try to convert it to an int
	ll = int(
	self.options.loglevel) if self.options.loglevel.isdigit() else self.options.loglevel.upper()
	ch.setLevel(ll)
	# Format logs the same as bitcoind's debug.log with microprecision (so
	# log files can be concatenated and sorted)
	formatter = logging.Formatter(
	fmt='%(asctime)s.%(msecs)03d000 %(name)s (%(levelname)s): %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
	fh.setFormatter(formatter)
	ch.setFormatter(formatter)

	# add the handlers to the logger
	self.log.addHandler(fh)
	self.log.addHandler(ch)

	if self.options.trace_rpc:
	rpc_logger = logging.getLogger("BitcoinRPC")
	rpc_logger.setLevel(logging.DEBUG)
	rpc_handler = logging.StreamHandler(sys.stdout)
	rpc_handler.setLevel(logging.DEBUG)
	rpc_logger.addHandler(rpc_handler)

	# Test framework for doing p2p comparison testing, which sets up some bitcoind
	# binaries:
	# 1 binary: test binary
	# 2 binaries: 1 test binary, 1 ref binary
	# n>2 binaries: 1 test binary, n-1 ref binaries


	class ComparisonTestFramework(BitcoinTestFramework):

	def __init__(self):
	super().__init__()
	self.num_nodes = 2
	self.setup_clean_chain = True

	def add_options(self, parser):
	parser.add_option("--testbinary", dest="testbinary",
	default=os.getenv("BITCOIND", "bitcoind"),
	help="bitcoind binary to test")
	parser.add_option("--refbinary", dest="refbinary",
	default=os.getenv("BITCOIND", "bitcoind"),
	help="bitcoind binary to use for reference nodes (if any)")

	def setup_network(self):
	extra_args = [['-whitelist=127.0.0.1']] * self.num_nodes
	if hasattr(self, "extra_args"):
	extra_args = self.extra_args
	self.nodes = start_nodes(
	self.num_nodes, self.options.tmpdir, extra_args,
	binary=[self.options.testbinary] +
	[self.options.refbinary] * (self.num_nodes - 1))
	diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
	index 1a55e0e5d..99a1591f0 100755
	--- a/test/functional/test_runner.py
	+++ b/test/functional/test_runner.py
	@@ -1,433 +1,417 @@
	#!/usr/bin/env python3
	# Copyright (c) 2014-2016 The Bitcoin Core developers
	# Copyright (c) 2017 The Bitcoin developers
	# Distributed under the MIT software license, see the accompanying
	# file COPYING or http://www.opensource.org/licenses/mit-license.php.
	"""Run regression test suite.

	This module calls down into individual test cases via subprocess. It will
	forward all unrecognized arguments onto the individual test scripts.

	Functional tests are disabled on Windows by default. Use --force to run them anyway.

	For a description of arguments recognized by test scripts, see
	`test/functional/test_framework/test_framework.py:BitcoinTestFramework.main`.

	"""

	import argparse
	import configparser
	import os
	import time
	import shutil
	import sys
	import subprocess
	import tempfile
	import re

	BOLD = ("", "")
	RED = ("", "")
	GREEN = ("", "")
	if os.name == 'posix':
	# primitive formatting on supported
	# terminal via ANSI escape sequences:
	BOLD = ('\033[0m', '\033[1m')
	RED = ("\033[0m", "\033[31m")
	GREEN = ("\033[0m", "\033[32m")

	BASE_SCRIPTS = [
	# Longest test should go first, to favor running tests in parallel
	'wallet-hd.py',
	'walletbackup.py',
	# vv Tests less than 5m vv
	'p2p-fullblocktest.py',
	'fundrawtransaction.py',
	'p2p-compactblocks.py',
	# vv Tests less than 2m vv
	'wallet.py',
	'wallet-accounts.py',
	'wallet-dump.py',
	'listtransactions.py',
	# vv Tests less than 60s vv
	'sendheaders.py',
	'zapwallettxes.py',
	'importmulti.py',
	'mempool_limit.py',
	'merkle_blocks.py',
	'receivedby.py',
	'abandonconflict.py',
	'bip68-112-113-p2p.py',
	'rawtransactions.py',
	'reindex.py',
	# vv Tests less than 30s vv
	+ 'zmq_test.py',
	'mempool_resurrect_test.py',
	'txn_doublespend.py --mineblock',
	'txn_clone.py',
	'getchaintips.py',
	'rest.py',
	'mempool_spendcoinbase.py',
	'mempool_reorg.py',
	'httpbasics.py',
	'multi_rpc.py',
	'proxy_test.py',
	'signrawtransactions.py',
	'disconnect_ban.py',
	'decodescript.py',
	'blockchain.py',
	'disablewallet.py',
	'keypool.py',
	'p2p-mempool.py',
	'prioritise_transaction.py',
	'high_priority_transaction.py',
	'invalidblockrequest.py',
	'invalidtxrequest.py',
	'p2p-versionbits-warning.py',
	'preciousblock.py',
	'importprunedfunds.py',
	'signmessages.py',
	'nulldummy.py',
	'import-rescan.py',
	'rpcnamedargs.py',
	'listsinceblock.py',
	'p2p-leaktests.py',
	'abc-cmdline.py',
	'abc-p2p-fullblocktest.py',
	'abc-rpc.py',
	'mempool-accept-txn.py',
	]

	-ZMQ_SCRIPTS = [
	- # ZMQ test can only be run if bitcoin was built with zmq-enabled.
	- # call test_runner.py with -nozmq to explicitly exclude these tests.
	- "zmq_test.py"]
	-
	EXTENDED_SCRIPTS = [
	# Longest test should go first, to favor running tests in parallel
	'pruning.py',
	# vv Tests less than 20m vv
	'smartfees.py',
	# vv Tests less than 5m vv
	'maxuploadtarget.py',
	'mempool_packages.py',
	# vv Tests less than 2m vv
	'bip68-sequence.py',
	'getblocktemplate_longpoll.py',
	'p2p-timeouts.py',
	# vv Tests less than 60s vv
	'bip9-softforks.py',
	'p2p-feefilter.py',
	'rpcbind_test.py',
	# vv Tests less than 30s vv
	'bip65-cltv.py',
	'bip65-cltv-p2p.py',
	'bipdersig-p2p.py',
	'bipdersig.py',
	'getblocktemplate_proposals.py',
	'txn_doublespend.py',
	'txn_clone.py --mineblock',
	'forknotify.py',
	'invalidateblock.py',
	'maxblocksinflight.py',
	'p2p-acceptblock.py',
	]

	-ALL_SCRIPTS = BASE_SCRIPTS + ZMQ_SCRIPTS + EXTENDED_SCRIPTS
	+# Place EXTENDED_SCRIPTS first since it has the 3 longest running tests
	+ALL_SCRIPTS = EXTENDED_SCRIPTS + BASE_SCRIPTS


	def main():
	# Parse arguments and pass through unrecognised args
	parser = argparse.ArgumentParser(add_help=False,
	usage='%(prog)s [test_runner.py options] [script options] [scripts]',
	description=__doc__,
	epilog='''
	Help text and arguments for individual test script:''',
	formatter_class=argparse.RawTextHelpFormatter)
	parser.add_argument('--coverage', action='store_true',
	help='generate a basic coverage report for the RPC interface')
	parser.add_argument(
	'--exclude', '-x', help='specify a comma-seperated-list of scripts to exclude. Do not include the .py extension in the name.')
	parser.add_argument('--extended', action='store_true',
	help='run the extended test suite in addition to the basic tests')
	parser.add_argument('--force', '-f', action='store_true',
	help='run tests even on platforms where they are disabled by default (e.g. windows).')
	parser.add_argument('--help', '-h', '-?',
	action='store_true', help='print help text and exit')
	parser.add_argument('--jobs', '-j', type=int, default=4,
	help='how many test scripts to run in parallel. Default=4.')
	- parser.add_argument('--nozmq', action='store_true',
	- help='do not run the zmq tests')
	args, unknown_args = parser.parse_known_args()

	# Create a set to store arguments and create the passon string
	tests = set(arg for arg in unknown_args if arg[:2] != "--")
	passon_args = [arg for arg in unknown_args if arg[:2] == "--"]

	# Read config generated by configure.
	config = configparser.ConfigParser()
	- config.read_file(open(os.path.dirname(__file__) + "/config.ini"))
	+ configfile = os.path.abspath(os.path.dirname(__file__)) + "/config.ini"
	+ config.read_file(open(configfile))
	+
	+ passon_args.append("--configfile=%s" % configfile)

	enable_wallet = config["components"].getboolean("ENABLE_WALLET")
	enable_utils = config["components"].getboolean("ENABLE_UTILS")
	enable_bitcoind = config["components"].getboolean("ENABLE_BITCOIND")
	- enable_zmq = config["components"].getboolean(
	- "ENABLE_ZMQ") and not args.nozmq

	if config["environment"]["EXEEXT"] == ".exe" and not args.force:
	# https://github.com/bitcoin/bitcoin/commit/d52802551752140cf41f0d9a225a43e84404d3e9
	# https://github.com/bitcoin/bitcoin/pull/5677#issuecomment-136646964
	print(
	"Tests currently disabled on Windows by default. Use --force option to enable")
	sys.exit(0)

	if not (enable_wallet and enable_utils and enable_bitcoind):
	print(
	"No functional tests to run. Wallet, utils, and bitcoind must all be enabled")
	print(
	"Rerun `configure` with -enable-wallet, -with-utils and -with-daemon and rerun make")
	sys.exit(0)

	- # python3-zmq may not be installed. Handle this gracefully and with some
	- # helpful info
	- if enable_zmq:
	- try:
	- import zmq
	- except ImportError:
	- print("ERROR: \"import zmq\" failed. Use -nozmq to run without the ZMQ tests."
	- "To run zmq tests, see dependency info in /test/README.md.")
	- raise
	-
	# Build list of tests
	if tests:
	# Individual tests have been specified. Run specified tests that exist
	# in the ALL_SCRIPTS list. Accept the name with or without .py
	# extension.
	test_list = [t for t in ALL_SCRIPTS if
	(t in tests or re.sub(".py$", "", t) in tests)]
	else:
	- # No individual tests have been specified. Run base tests, and
	- # optionally ZMQ tests and extended tests.
	+ # No individual tests have been specified.
	+ # Run all base tests, and optionally run extended tests.
	test_list = BASE_SCRIPTS
	- if enable_zmq:
	- test_list += ZMQ_SCRIPTS
	if args.extended:
	test_list += EXTENDED_SCRIPTS
	# TODO: BASE_SCRIPTS and EXTENDED_SCRIPTS are sorted by runtime
	# (for parallel running efficiency). This combined list will is no
	# longer sorted.

	# Remove the test cases that the user has explicitly asked to exclude.
	if args.exclude:
	for exclude_test in args.exclude.split(','):
	if exclude_test + ".py" in test_list:
	test_list.remove(exclude_test + ".py")

	if not test_list:
	print("No valid test scripts specified. Check that your test is in one "
	"of the test lists in test_runner.py, or run test_runner.py with no arguments to run all tests")
	sys.exit(0)

	if args.help:
	# Print help for test_runner.py, then print help of the first script
	# and exit.
	parser.print_help()
	subprocess.check_call(
	(config["environment"]["SRCDIR"] + '/test/functional/' + test_list[0]).split() + ['-h'])
	sys.exit(0)

	run_tests(
	test_list, config["environment"][
	"SRCDIR"], config["environment"]["BUILDDIR"],
	config["environment"]["EXEEXT"], args.jobs, args.coverage, passon_args)


	def run_tests(test_list, src_dir, build_dir, exeext, jobs=1, enable_coverage=False, args=[]):
	# Set env vars
	if "BITCOIND" not in os.environ:
	os.environ["BITCOIND"] = build_dir + '/src/bitcoind' + exeext

	tests_dir = src_dir + '/test/functional/'
	flags = ["--srcdir={}".format(src_dir)] + args
	flags.append("--cachedir=%s/test/cache" % build_dir)

	if enable_coverage:
	coverage = RPCCoverage()
	flags.append(coverage.flag)
	print("Initializing coverage directory at {dir}\n".format(
	dir=coverage.dir))
	else:
	coverage = None

	if len(test_list) > 1 and jobs > 1:
	# Populate cache
	subprocess.check_output([tests_dir + 'create_cache.py'] + flags)

	# Run Tests
	all_passed = True
	time_sum = 0
	time0 = time.time()

	job_queue = TestHandler(jobs, tests_dir, test_list, flags)

	max_len_name = len(max(test_list, key=len))
	results = BOLD[1] + "%s \| %s \| %s\n\n" % (
	"TEST".ljust(max_len_name), "PASSED", "DURATION") + BOLD[0]
	for _ in range(len(test_list)):
	(name, stdout, stderr, passed, duration) = job_queue.get_next()
	all_passed = all_passed and passed
	time_sum += duration

	print('\n' + BOLD[1] + name + BOLD[0] + ":")
	print('' if passed else stdout + '\n', end='')
	print('' if stderr == '' else 'stderr:\n' + stderr + '\n', end='')
	print("Pass: {bold}{result}{unbold}, Duration: {duration}s\n".format(
	bold=BOLD[1], result=passed, unbold=BOLD[0], duration=duration))
	result = "{name} \| {passed} \| {duration}s\n".format(name=name.ljust(
	max_len_name), passed=str(passed).ljust(6), duration=duration)
	if passed:
	results += GREEN[1] + result + GREEN[0]
	else:
	results += RED[1] + result + RED[0]

	results += BOLD[1] + "\n{name} \| {passed} \| {duration}s (accumulated)".format(
	name="ALL".ljust(max_len_name), passed=str(all_passed).ljust(6), duration=time_sum) + BOLD[0]
	print(results)
	print("\nRuntime: {} s".format(int(time.time() - time0)))

	if coverage:
	coverage.report_rpc_coverage()

	print("Cleaning up coverage data")
	coverage.cleanup()

	sys.exit(not all_passed)


	class TestHandler:

	"""
	Trigger the testscrips passed in via the list.
	"""

	def __init__(self, num_tests_parallel, tests_dir, test_list=None, flags=None):
	assert(num_tests_parallel >= 1)
	self.num_jobs = num_tests_parallel
	self.tests_dir = tests_dir
	self.test_list = test_list
	self.flags = flags
	self.num_running = 0
	# In case there is a graveyard of zombie bitcoinds, we can apply a
	# pseudorandom offset to hopefully jump over them.
	# (625 is PORT_RANGE/MAX_NODES)
	self.portseed_offset = int(time.time() * 1000) % 625
	self.jobs = []

	def get_next(self):
	while self.num_running < self.num_jobs and self.test_list:
	# Add tests
	self.num_running += 1
	t = self.test_list.pop(0)
	port_seed = ["--portseed={}".format(
	len(self.test_list) + self.portseed_offset)]
	log_stdout = tempfile.SpooledTemporaryFile(max_size=2**16)
	log_stderr = tempfile.SpooledTemporaryFile(max_size=2**16)
	self.jobs.append((t,
	time.time(),
	subprocess.Popen(
	(self.tests_dir + t).split() +
	self.flags + port_seed,
	universal_newlines=True,
	stdout=log_stdout,
	stderr=log_stderr),
	log_stdout,
	log_stderr))
	if not self.jobs:
	raise IndexError('pop from empty list')
	while True:
	# Return first proc that finishes
	time.sleep(.5)
	for j in self.jobs:
	(name, time0, proc, log_out, log_err) = j
	if proc.poll() is not None:
	log_out.seek(0), log_err.seek(0)
	[stdout, stderr] = [l.read().decode('utf-8')
	for l in (log_out, log_err)]
	log_out.close(), log_err.close()
	passed = stderr == "" and proc.returncode == 0
	self.num_running -= 1
	self.jobs.remove(j)
	return name, stdout, stderr, passed, int(
	time.time() - time0)
	print('.', end='', flush=True)


	class RPCCoverage(object):

	"""
	Coverage reporting utilities for test_runner.

	Coverage calculation works by having each test script subprocess write
	coverage files into a particular directory. These files contain the RPC
	commands invoked during testing, as well as a complete listing of RPC
	commands per `bitcoin-cli help` (`rpc_interface.txt`).

	After all tests complete, the commands run are combined and diff'd against
	the complete list to calculate uncovered RPC commands.

	See also: test/functional/test_framework/coverage.py

	"""

	def __init__(self):
	self.dir = tempfile.mkdtemp(prefix="coverage")
	self.flag = '--coveragedir={}'.format(self.dir)

	def report_rpc_coverage(self):
	"""
	Print out RPC commands that were unexercised by tests.

	"""
	uncovered = self._get_uncovered_rpc_commands()

	if uncovered:
	print("Uncovered RPC commands:")
	print("".join((" - {}\n".format(i)) for i in sorted(uncovered)))
	else:
	print("All RPC commands covered.")

	def cleanup(self):
	return shutil.rmtree(self.dir)

	def _get_uncovered_rpc_commands(self):
	"""
	Return a set of currently untested RPC commands.

	"""
	# This is shared from `test/functional/test-framework/coverage.py`
	reference_filename = 'rpc_interface.txt'
	coverage_file_prefix = 'coverage.'

	coverage_ref_filename = os.path.join(self.dir, reference_filename)
	coverage_filenames = set()
	all_cmds = set()
	covered_cmds = set()

	if not os.path.isfile(coverage_ref_filename):
	raise RuntimeError("No coverage reference found")

	with open(coverage_ref_filename, 'r') as f:
	all_cmds.update([i.strip() for i in f.readlines()])

	for root, dirs, files in os.walk(self.dir):
	for filename in files:
	if filename.startswith(coverage_file_prefix):
	coverage_filenames.add(os.path.join(root, filename))

	for filename in coverage_filenames:
	with open(filename, 'r') as f:
	covered_cmds.update([i.strip() for i in f.readlines()])

	return all_cmds - covered_cmds


	if __name__ == '__main__':
	main()
	diff --git a/test/functional/zmq_test.py b/test/functional/zmq_test.py
	index 6b37c961d..f3fb33a5a 100755
	--- a/test/functional/zmq_test.py
	+++ b/test/functional/zmq_test.py
	@@ -1,107 +1,126 @@
	#!/usr/bin/env python3
	# Copyright (c) 2015-2017 The Bitcoin Core developers
	# Copyright (c) 2017 The Bitcoin developers
	# Distributed under the MIT software license, see the accompanying
	# file COPYING or http://www.opensource.org/licenses/mit-license.php.

	-#
	-# Test ZMQ interface
	-#
	+"""Test the ZMQ API."""
	+import configparser
	+import os
	+import struct
	+import sys

	from test_framework.test_framework import BitcoinTestFramework
	from test_framework.util import *
	-import zmq
	-import struct


	class ZMQTest (BitcoinTestFramework):

	def __init__(self):
	super().__init__()
	self.num_nodes = 2

	def setup_nodes(self):
	+ # Try to import python3-zmq. Skip this test if the import fails.
	+ try:
	+ import zmq
	+ except ImportError:
	+ self.log.warning(
	+ "python3-zmq module not available. Skipping zmq tests!")
	+ sys.exit(self.TEST_EXIT_SKIPPED)
	+
	+ # Check that bitcoin has been built with ZMQ enabled
	+ config = configparser.ConfigParser()
	+ if not self.options.configfile:
	+ self.options.configfile = os.path.dirname(__file__) + "/config.ini"
	+ config.read_file(open(self.options.configfile))
	+
	+ if not config["components"].getboolean("ENABLE_ZMQ"):
	+ self.log.warning(
	+ "bitcoind has not been built with zmq enabled. Skipping zmq tests!")
	+ sys.exit(self.TEST_EXIT_SKIPPED)
	+
	self.zmqContext = zmq.Context()
	self.zmqSubSocket = self.zmqContext.socket(zmq.SUB)
	self.zmqSubSocket.set(zmq.RCVTIMEO, 60000)
	self.zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashblock")
	self.zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashtx")
	ip_address = "tcp://127.0.0.1:28332"
	self.zmqSubSocket.connect(ip_address)
	extra_args = [
	['-zmqpubhashtx=%s' % ip_address, '-zmqpubhashblock=%s' % ip_address], []]
	self.nodes = start_nodes(
	self.num_nodes, self.options.tmpdir, extra_args)

	def run_test(self):
	try:
	self._zmq_test()
	finally:
	# Destroy the zmq context
	self.log.debug("Destroying zmq context")
	self.zmqContext.destroy(linger=None)

	def _zmq_test(self):
	genhashes = self.nodes[0].generate(1)
	self.sync_all()

	self.log.info("listen...")
	msg = self.zmqSubSocket.recv_multipart()
	topic = msg[0]
	assert_equal(topic, b"hashtx")
	body = msg[1]
	msgSequence = struct.unpack('<I', msg[-1])[-1]
	# Must be sequence 0 on hashtx
	assert_equal(msgSequence, 0)

	msg = self.zmqSubSocket.recv_multipart()
	topic = msg[0]
	body = msg[1]
	msgSequence = struct.unpack('<I', msg[-1])[-1]
	# Must be sequence 0 on hashblock
	assert_equal(msgSequence, 0)
	blkhash = bytes_to_hex_str(body)

	# blockhash from generate must be equal to the hash received over zmq
	assert_equal(genhashes[0], blkhash)

	n = 10
	genhashes = self.nodes[1].generate(n)
	self.sync_all()

	zmqHashes = []
	blockcount = 0
	for x in range(n * 2):
	msg = self.zmqSubSocket.recv_multipart()
	topic = msg[0]
	body = msg[1]
	if topic == b"hashblock":
	zmqHashes.append(bytes_to_hex_str(body))
	msgSequence = struct.unpack('<I', msg[-1])[-1]
	assert_equal(msgSequence, blockcount + 1)
	blockcount += 1

	for x in range(n):
	# blockhash from generate must be equal to the hash
	# received over zmq
	assert_equal(genhashes[x], zmqHashes[x])

	# Test tx from a second node
	hashRPC = self.nodes[1].sendtoaddress(
	self.nodes[0].getnewaddress(), 1.0)
	self.sync_all()

	# Now we should receive a zmq msg because the tx was broadcast
	msg = self.zmqSubSocket.recv_multipart()
	topic = msg[0]
	body = msg[1]
	assert_equal(topic, b"hashtx")
	hashZMQ = bytes_to_hex_str(body)
	msgSequence = struct.unpack('<I', msg[-1])[-1]
	assert_equal(msgSequence, blockcount + 1)
	# txid from sendtoaddress must be equal to the hash received over zmq
	assert_equal(hashRPC, hashZMQ)


	if __name__ == '__main__':
	ZMQTest().main()

File Metadata

Mime Type: text/x-diff
Expires: Wed, May 21, 21:52 (1 d, 18 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 5866001
Default Alt Text: (31 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions