@@ -195,7 +195,7 @@ test_bitcoin_filtered.info: test_bitcoin.info | |||
$(LCOV) -r $< "/usr/include/*" -o $@ | |||
rpc_test.info: test_bitcoin_filtered.info | |||
-@TIMEOUT=15 python qa/pull-tester/rpc-tests.py $(EXTENDED_RPC_TESTS) | |||
-@TIMEOUT=15 python test/pull-tester/rpc-tests.py $(EXTENDED_RPC_TESTS) | |||
$(LCOV) -c -d $(abs_builddir)/src --t rpc-tests -o $@ | |||
$(LCOV) -z -d $(abs_builddir)/src | |||
$(LCOV) -z -d $(abs_builddir)/src/leveldb | |||
@@ -223,7 +223,7 @@ endif | |||
dist_noinst_SCRIPTS = autogen.sh | |||
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.py qa/rpc-tests $(DIST_CONTRIB) $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS) | |||
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh test/pull-tester/rpc-tests.py test/rpc-tests $(DIST_CONTRIB) $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS) | |||
CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER) | |||
@@ -232,5 +232,5 @@ CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER) | |||
DISTCHECK_CONFIGURE_FLAGS = --enable-man | |||
clean-local: | |||
rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ qa/tmp/ cache/ $(OSX_APP) | |||
rm -rf qa/pull-tester/__pycache__ | |||
rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP) | |||
rm -rf test/pull-tester/__pycache__ |
@@ -54,9 +54,9 @@ submit new unit tests for old code. Unit tests can be compiled and run | |||
(assuming they weren't disabled in configure) with: `make check`. Further details on running | |||
and extending unit tests can be found in [/src/test/README.md](/src/test/README.md). | |||
There are also [regression and integration tests](/qa) of the RPC interface, written | |||
There are also [regression and integration tests](/test) of the RPC interface, written | |||
in Python, that are run automatically on the build server. | |||
These tests can be run (if the [test dependencies](/qa) are installed) with: `qa/pull-tester/rpc-tests.py` | |||
These tests can be run (if the [test dependencies](/test) are installed) with: `test/pull-tester/rpc-tests.py` | |||
The Travis CI system makes sure that every pull request is built for Windows, Linux, and OS X, and that unit/sanity tests are run automatically. | |||
@@ -1148,9 +1148,9 @@ 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.ini],[chmod +x qa/pull-tester/tests_config.ini]) | |||
AC_CONFIG_FILES([test/pull-tester/tests_config.ini],[chmod +x test/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]) | |||
AC_CONFIG_LINKS([test/pull-tester/rpc-tests.py:test/pull-tester/rpc-tests.py]) | |||
dnl boost's m4 checks do something really nasty: they export these vars. As a | |||
dnl result, they leak into secp256k1's configure and crazy things happen. | |||
@@ -1198,8 +1198,8 @@ esac | |||
dnl Replace the BUILDDIR path with the correct Windows path if compiling on Native Windows | |||
case ${OS} in | |||
*Windows*) | |||
sed 's/BUILDDIR="\/\([[a-z]]\)/BUILDDIR="\1:/' qa/pull-tester/tests_config.py > qa/pull-tester/tests_config-2.py | |||
mv qa/pull-tester/tests_config-2.py qa/pull-tester/tests_config.py | |||
sed 's/BUILDDIR="\/\([[a-z]]\)/BUILDDIR="\1:/' test/pull-tester/tests_config.py > test/pull-tester/tests_config-2.py | |||
mv test/pull-tester/tests_config-2.py test/pull-tester/tests_config.py | |||
;; | |||
esac | |||
@@ -32,7 +32,7 @@ EXCLUDE = [ | |||
'src/tinyformat.h', | |||
'src/leveldb/util/env_win.cc', | |||
'src/crypto/ctaes/bench.c', | |||
'qa/rpc-tests/test_framework/bignum.py', | |||
'test/rpc-tests/test_framework/bignum.py', | |||
# python init: | |||
'*__init__.py', | |||
] |
@@ -314,7 +314,7 @@ make check | |||
pushd src | |||
srcdir=. test/bitcoin-util-test.py | |||
popd | |||
qa/pull-tester/rpc-tests.py -extended | |||
test/pull-tester/rpc-tests.py -extended | |||
%post libs -p /sbin/ldconfig | |||
@@ -132,7 +132,7 @@ Run with the -testnet option to run with "play bitcoins" on the test network, if | |||
are testing multi-machine code that needs to operate across the internet. | |||
If you are testing something that can run on one machine, run with the -regtest option. | |||
In regression test mode, blocks can be created on-demand; see qa/rpc-tests/ for tests | |||
In regression test mode, blocks can be created on-demand; see test/rpc-tests/ for tests | |||
that run in -regtest mode. | |||
**DEBUG_LOCKORDER** | |||
@@ -252,7 +252,7 @@ Wallet | |||
- *Rationale*: In RPC code that conditionally uses the wallet (such as | |||
`validateaddress`) it is easy to forget that global pointer `pwalletMain` | |||
can be NULL. See `qa/rpc-tests/disablewallet.py` for functional tests | |||
can be NULL. See `test/rpc-tests/disablewallet.py` for functional tests | |||
exercising the API with `-disablewallet` | |||
- Include `db_cxx.h` (BerkeleyDB header) only when `ENABLE_WALLET` is set |
@@ -1,5 +1,5 @@ | |||
The [pull-tester](/qa/pull-tester/) folder contains a script to call | |||
multiple tests from the [rpc-tests](/qa/rpc-tests/) folder. | |||
The [pull-tester](/test/pull-tester/) folder contains a script to call | |||
multiple tests from the [rpc-tests](/test/rpc-tests/) folder. | |||
Every pull request to the bitcoin repository is built and run through | |||
the regression test suite. You can also run all or only individual | |||
@@ -27,19 +27,19 @@ Running tests | |||
You can run any single test by calling | |||
qa/pull-tester/rpc-tests.py <testname> | |||
test/pull-tester/rpc-tests.py <testname> | |||
Or you can run any combination of tests by calling | |||
qa/pull-tester/rpc-tests.py <testname1> <testname2> <testname3> ... | |||
test/pull-tester/rpc-tests.py <testname1> <testname2> <testname3> ... | |||
Run the regression test suite with | |||
qa/pull-tester/rpc-tests.py | |||
test/pull-tester/rpc-tests.py | |||
Run all possible tests with | |||
qa/pull-tester/rpc-tests.py --extended | |||
test/pull-tester/rpc-tests.py --extended | |||
By default, tests will be run in parallel. To specify how many jobs to run, | |||
append `--jobs=n` (default n=4). | |||
@@ -61,7 +61,7 @@ Possible options, which apply to each individual test run: | |||
``` | |||
If you set the environment variable `PYTHON_DEBUG=1` you will get some debug | |||
output (example: `PYTHON_DEBUG=1 qa/pull-tester/rpc-tests.py wallet`). | |||
output (example: `PYTHON_DEBUG=1 test/pull-tester/rpc-tests.py wallet`). | |||
A 200-block -regtest blockchain and wallets for four nodes | |||
is created the first time a regression test is run and | |||
@@ -84,4 +84,4 @@ Writing tests | |||
============= | |||
You are encouraged to write tests for new or existing features. | |||
Further information about the test framework and individual RPC | |||
tests is found in [qa/rpc-tests](/qa/rpc-tests). | |||
tests is found in [test/rpc-tests](/test/rpc-tests). |
@@ -11,7 +11,7 @@ forward all unrecognized arguments onto the individual test scripts. | |||
RPC tests are disabled on Windows by default. Use --force to run them anyway. | |||
For a description of arguments recognized by test scripts, see | |||
`qa/pull-tester/test_framework/test_framework.py:BitcoinTestFramework.main`. | |||
`test/pull-tester/test_framework/test_framework.py:BitcoinTestFramework.main`. | |||
""" | |||
@@ -171,7 +171,7 @@ def main(): | |||
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 /qa/README.md.") | |||
"To run zmq tests, see dependency info in /test/README.md.") | |||
raise | |||
# Build list of tests | |||
@@ -206,7 +206,7 @@ def main(): | |||
if args.help: | |||
# Print help for rpc-tests.py, then print help of the first script and exit. | |||
parser.print_help() | |||
subprocess.check_call((config["environment"]["SRCDIR"] + '/qa/rpc-tests/' + test_list[0]).split() + ['-h']) | |||
subprocess.check_call((config["environment"]["SRCDIR"] + '/test/rpc-tests/' + 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) | |||
@@ -222,10 +222,10 @@ def run_tests(test_list, src_dir, build_dir, exeext, jobs=1, enable_coverage=Fal | |||
if "BITCOIND" not in os.environ: | |||
os.environ["BITCOIND"] = build_dir + '/src/bitcoind' + exeext | |||
tests_dir = src_dir + '/qa/rpc-tests/' | |||
tests_dir = src_dir + '/test/rpc-tests/' | |||
flags = ["--srcdir={}/src".format(build_dir)] + args | |||
flags.append("--cachedir=%s/qa/cache" % build_dir) | |||
flags.append("--cachedir=%s/test/cache" % build_dir) | |||
if enable_coverage: | |||
coverage = RPCCoverage() | |||
@@ -335,7 +335,7 @@ class RPCCoverage(object): | |||
After all tests complete, the commands run are combined and diff'd against | |||
the complete list to calculate uncovered RPC commands. | |||
See also: qa/rpc-tests/test_framework/coverage.py | |||
See also: test/rpc-tests/test_framework/coverage.py | |||
""" | |||
def __init__(self): | |||
@@ -363,7 +363,7 @@ class RPCCoverage(object): | |||
Return a set of currently untested RPC commands. | |||
""" | |||
# This is shared from `qa/rpc-tests/test-framework/coverage.py` | |||
# This is shared from `test/rpc-tests/test-framework/coverage.py` | |||
reference_filename = 'rpc_interface.txt' | |||
coverage_file_prefix = 'coverage.' | |||