Skip to content

Commit

Permalink
Use configparser in rpc-tests.py
Browse files Browse the repository at this point in the history
Summary:
Backport the following commit from Bitcoin Core

```
commit 1581ecbc33edd9d6257e50b11d8854fbccaf8ad8
Author: John Newbery <[email protected]>
Date:   Mon Jan 30 14:57:27 2017 -0800

    Use configparser in rpc-tests.py

    Remove the use of wildcard imports in rpc-tests.py and replace with
    configparser.
```

Test Plan: make check && ./qa/pull-tester/rpc-tests.py

Reviewers: deadalnix, freetrader, #bitcoin_abc, Yura

Reviewed By: deadalnix, #bitcoin_abc

Differential Revision: https://reviews.bitcoinabc.org/D817
  • Loading branch information
schancel committed Dec 17, 2017
1 parent 122ea23 commit 24c1598
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 38 deletions.
3 changes: 0 additions & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,6 @@ EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.py qa/rpc-

CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)

# This file is problematic for out-of-tree builds if it exists.
DISTCLEANFILES = qa/pull-tester/tests_config.pyc

.INTERMEDIATE: $(COVERAGE_INFO)

DISTCHECK_CONFIGURE_FLAGS = --enable-man
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1233,7 +1233,7 @@ AC_SUBST(ZMQ_LIBS)
AC_SUBST(PROTOBUF_LIBS)
AC_SUBST(QR_LIBS)
AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py])
AC_CONFIG_FILES([qa/pull-tester/tests_config.py],[chmod +x qa/pull-tester/tests_config.py])
AC_CONFIG_FILES([qa/pull-tester/tests_config.ini],[chmod +x qa/pull-tester/tests_config.ini])
AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh])
AC_CONFIG_LINKS([qa/pull-tester/rpc-tests.py:qa/pull-tester/rpc-tests.py])

Expand Down
38 changes: 18 additions & 20 deletions qa/pull-tester/rpc-tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"""

import configparser
import os
import time
import shutil
Expand All @@ -30,9 +31,6 @@
import tempfile
import re

sys.path.append("qa/pull-tester/")
from tests_config import *

BOLD = ("", "")
RED = ("", "")
GREEN = ("", "")
Expand All @@ -43,17 +41,16 @@
RED = ("\033[0m", "\033[31m")
GREEN = ("\033[0m", "\033[32m")

RPC_TESTS_DIR = SRCDIR + '/qa/rpc-tests/'
# Read config generated by configure.
config = configparser.ConfigParser()
config.read_file(open(os.path.dirname(__file__) + "/tests_config.ini"))

ENABLE_WALLET = config["components"]["ENABLE_WALLET"] == "True"
ENABLE_UTILS = config["components"]["ENABLE_UTILS"] == "True"
ENABLE_BITCOIND = config["components"]["ENABLE_BITCOIND"] == "True"
ENABLE_ZMQ = config["components"]["ENABLE_ZMQ"] == "True"

# If imported values are not defined then set to zero (or disabled)
if 'ENABLE_WALLET' not in vars():
ENABLE_WALLET = 0
if 'ENABLE_BITCOIND' not in vars():
ENABLE_BITCOIND = 0
if 'ENABLE_UTILS' not in vars():
ENABLE_UTILS = 0
if 'ENABLE_ZMQ' not in vars():
ENABLE_ZMQ = 0
RPC_TESTS_DIR = config["environment"]["SRCDIR"] + '/qa/rpc-tests/'

ENABLE_COVERAGE = 0

Expand Down Expand Up @@ -81,18 +78,18 @@

# Set env vars
if "BITCOIND" not in os.environ:
os.environ["BITCOIND"] = BUILDDIR + '/src/bitcoind' + EXEEXT
os.environ["BITCOIND"] = config["environment"]["BUILDDIR"] + \
'/src/bitcoind' + config["environment"]["EXEEXT"]

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

if not (ENABLE_WALLET == 1 and ENABLE_UTILS == 1 and ENABLE_BITCOIND == 1):
print(
"No rpc tests to run. Wallet, utils, and bitcoind must all be enabled")
if not (ENABLE_WALLET and ENABLE_UTILS and ENABLE_BITCOIND):
print("No rpc tests to run. Wallet, utils, and bitcoind must all be enabled")
sys.exit(0)

# python3-zmq may not be installed. Handle this gracefully and with some
Expand Down Expand Up @@ -220,8 +217,9 @@ def runtests():
if ENABLE_COVERAGE:
coverage = RPCCoverage()
print("Initializing coverage directory at %s\n" % coverage.dir)
flags = ["--srcdir=%s/src" % BUILDDIR] + passon_args
flags.append("--cachedir=%s/qa/cache" % BUILDDIR)
flags = ["--srcdir=%s/src" %
config["environment"]["BUILDDIR"]] + passon_args
flags.append("--cachedir=%s/qa/cache" % config["environment"]["BUILDDIR"])
if coverage:
flags.append(coverage.flag)

Expand Down
25 changes: 25 additions & 0 deletions qa/pull-tester/tests_config.ini.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Copyright (c) 2013-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.

# These environment variables are set by the build process and read by
# rpc-tests.py

[DEFAULT]
# Provides default values for whether different components are enabled
ENABLE_WALLET=False
ENABLE_UTILS=False
ENABLE_BITCOIND=False
ENABLE_ZMQ=False

[environment]
SRCDIR=@abs_top_srcdir@
BUILDDIR=@abs_top_builddir@
EXEEXT=@EXEEXT@

[components]
# Which components are enabled. These are commented out by `configure` if they were disabled when running config.
@ENABLE_WALLET_TRUE@ENABLE_WALLET=True
@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=True
@BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=True
@ENABLE_ZMQ_TRUE@ENABLE_ZMQ=True
14 changes: 0 additions & 14 deletions qa/pull-tester/tests_config.py.in

This file was deleted.

0 comments on commit 24c1598

Please sign in to comment.