Browse Source

Merge #10307: [tests] allow zmq test to be run in out-of-tree builds

b8251f6 [tests] allow zmq test to be run in out-of-tree builds (John Newbery)

Tree-SHA512: 6946d23bc8a0b57e841a6811989182732d0534989e0e3b94421387f7971379b25a25d238cad22272e04076293275f6e980c8a713fce87ba48c1c4463d9243051
pull/1/head
Wladimir J. van der Laan 5 years ago
parent
commit
83073de4bd
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 2
      test/functional/test_framework/test_framework.py
  2. 5
      test/functional/test_runner.py
  3. 4
      test/functional/zmq_test.py

2
test/functional/test_framework/test_framework.py

@ -115,6 +115,8 @@ class BitcoinTestFramework(object): @@ -115,6 +115,8 @@ class BitcoinTestFramework(object):
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()

5
test/functional/test_runner.py

@ -178,7 +178,10 @@ def main(): @@ -178,7 +178,10 @@ def main():
# 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)
# Set up logging
logging_level = logging.INFO if args.quiet else logging.DEBUG

4
test/functional/zmq_test.py

@ -29,7 +29,9 @@ class ZMQTest (BitcoinTestFramework): @@ -29,7 +29,9 @@ class ZMQTest (BitcoinTestFramework):
# Check that bitcoin has been built with ZMQ enabled
config = configparser.ConfigParser()
config.read_file(open(os.path.dirname(__file__) + "/config.ini"))
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!")

Loading…
Cancel
Save