diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-04-03 12:34:25 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-04-03 12:34:36 +0200 |
| commit | 952bf9738e9d0cfe1df45b36eb7a735ea1a91998 (patch) | |
| tree | c35a6851b5e64b6dbca06ebcbc9d28fb8089068c | |
| parent | 9bd1bdd08cd4e90f5004c40f2f3cee0f250b0811 (diff) | |
| parent | cb4bdd18a74470e190f552a2425c12c6e2f33138 (diff) | |
Merge pull request #3998
cb4bdd1 Have pull-tester run the listtransactions.py regression test (Gavin Andresen)
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | qa/pull-tester/build-tests.sh.in | 3 | ||||
| -rw-r--r-- | qa/rpc-tests/util.py | 13 |
3 files changed, 12 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 7a46652ec6..0b3a822bff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -162,7 +162,7 @@ check-local: @qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS) endif -EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/pull-tester.sh $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) +EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/pull-tester.sh qa/rpc-tests $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) CLEANFILES = $(OSX_DMG) $(OSX_APP) $(BITCOIN_WIN_INSTALLER) diff --git a/qa/pull-tester/build-tests.sh.in b/qa/pull-tester/build-tests.sh.in index e7db721110..ebf377a489 100755 --- a/qa/pull-tester/build-tests.sh.in +++ b/qa/pull-tester/build-tests.sh.in @@ -74,6 +74,9 @@ make check # Run RPC integration test on Linux: @abs_top_srcdir@/qa/rpc-tests/wallet.sh @abs_top_srcdir@/linux-build/src +@abs_top_srcdir@/qa/rpc-tests/listtransactions.py --srcdir @abs_top_srcdir@/linux-build/src +# Clean up cache/ directory that the python regression tests create +rm -rf cache if [ $RUN_EXPENSIVE_TESTS = 1 ]; then # Run unit tests and blockchain-tester on Windows: diff --git a/qa/rpc-tests/util.py b/qa/rpc-tests/util.py index fa0700f1c8..1d0896a3fb 100644 --- a/qa/rpc-tests/util.py +++ b/qa/rpc-tests/util.py @@ -65,6 +65,7 @@ def initialize_chain(test_dir): """ if not os.path.isdir(os.path.join("cache", "node0")): + devnull = open("/dev/null", "w+") # Create cache directories, run bitcoinds: for i in range(4): datadir = os.path.join("cache", "node"+str(i)) @@ -79,9 +80,9 @@ def initialize_chain(test_dir): if i > 0: args.append("-connect=127.0.0.1:"+str(START_P2P_PORT)) bitcoind_processes.append(subprocess.Popen(args)) - subprocess.check_output([ "bitcoin-cli", "-datadir="+datadir, - "-rpcwait", "getblockcount"]) - + subprocess.check_call([ "bitcoin-cli", "-datadir="+datadir, + "-rpcwait", "getblockcount"], stdout=devnull) + devnull.close() rpcs = [] for i in range(4): try: @@ -113,12 +114,14 @@ def initialize_chain(test_dir): def start_nodes(num_nodes, dir): # Start bitcoinds, and wait for RPC interface to be up and running: + devnull = open("/dev/null", "w+") for i in range(num_nodes): datadir = os.path.join(dir, "node"+str(i)) args = [ "bitcoind", "-datadir="+datadir ] bitcoind_processes.append(subprocess.Popen(args)) - subprocess.check_output([ "bitcoin-cli", "-datadir="+datadir, - "-rpcwait", "getblockcount"]) + subprocess.check_call([ "bitcoin-cli", "-datadir="+datadir, + "-rpcwait", "getblockcount"], stdout=devnull) + devnull.close() # Create&return JSON-RPC connections rpc_connections = [] for i in range(num_nodes): |