Merge branch 'master' into single_prodname

1 files changed, 28 insertions, 10 deletions

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 7a30db68dd..e7173fda08 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-# Copyright (c) 2014 The Bitcoin Core developers
+# Copyright (c) 2014-2015 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -22,6 +22,7 @@ For a description of arguments recognized by test scripts, see
 """
 
 import os
+import time
 import shutil
 import sys
 import subprocess
@@ -47,6 +48,10 @@ opts = set()
 passOn = ""
 p = re.compile("^--")
 
+bold = ("","")
+if (os.name == 'posix'):
+    bold = ('\033[0m', '\033[1m')
+
 for arg in sys.argv[1:]:
     if arg == '--coverage':
         ENABLE_COVERAGE = 1
@@ -57,8 +62,10 @@ for arg in sys.argv[1:]:
 
 #Set env vars
 buildDir = BUILDDIR
-os.environ["BITCOIND"] = buildDir + '/src/bitcoind' + EXEEXT
-os.environ["BITCOINCLI"] = buildDir + '/src/bitcoin-cli' + EXEEXT
+if "BITCOIND" not in os.environ:
+    os.environ["BITCOIND"] = buildDir + '/src/bitcoind' + EXEEXT
+if "BITCOINCLI" not in os.environ:
+    os.environ["BITCOINCLI"] = buildDir + '/src/bitcoin-cli' + EXEEXT
 
 #Disable Windows tests by default
 if EXEEXT == ".exe" and "-win" not in opts:
@@ -77,8 +84,10 @@ testScripts = [
     'rawtransactions.py',
     'rest.py',
     'mempool_spendcoinbase.py',
-    'mempool_coinbase_spends.py',
+    'mempool_reorg.py',
+    'mempool_limit.py',
     'httpbasics.py',
+    'multi_rpc.py',
     'zapwallettxes.py',
     'proxy_test.py',
     'merkle_blocks.py',
@@ -91,6 +100,12 @@ testScripts = [
     'p2p-fullblocktest.py',
     'blockchain.py',
     'disablewallet.py',
+    'sendheaders.py',
+    'keypool.py',
+    'prioritise_transaction.py',
+    'invalidblockrequest.py',
+    'invalidtxrequest.py',
+    'abandonconflict.py',
 ]
 testScriptsExt = [
     'bip65-cltv.py',
@@ -104,14 +119,13 @@ testScriptsExt = [
     'pruning.py',
     'forknotify.py',
     'invalidateblock.py',
-    'keypool.py',
 #    'rpcbind_test.py', #temporary, bug in libevent, see #6655
     'smartfees.py',
     'maxblocksinflight.py',
-    'invalidblockrequest.py',
     'p2p-acceptblock.py',
     'mempool_packages.py',
     'maxuploadtarget.py',
+    'replace-by-fee.py',
 ]
 
 #Enable ZMQ tests
@@ -124,7 +138,7 @@ def runtests():
 
     if ENABLE_COVERAGE:
         coverage = RPCCoverage()
-        print("Initializing coverage directory at %s" % coverage.dir)
+        print("Initializing coverage directory at %s\n" % coverage.dir)
 
     if(ENABLE_WALLET == 1 and ENABLE_UTILS == 1 and ENABLE_BITCOIND == 1):
         rpcTestDir = buildDir + '/qa/rpc-tests/'
@@ -139,10 +153,12 @@ def runtests():
                     or run_extended
                     or testScripts[i] in opts
                     or re.sub(".py$", "", testScripts[i]) in opts ):
-                print("Running testscript " + testScripts[i] + "...")
 
+                print("Running testscript %s%s%s ..." % (bold[1], testScripts[i], bold[0]))
+                time0 = time.time()
                 subprocess.check_call(
                     rpcTestDir + testScripts[i] + flags, shell=True)
+                print("Duration: %s s\n" % (int(time.time() - time0)))
 
                 # exit if help is called so we print just one set of
                 # instructions
@@ -154,12 +170,14 @@ def runtests():
         for i in range(len(testScriptsExt)):
             if (run_extended or testScriptsExt[i] in opts
                     or re.sub(".py$", "", testScriptsExt[i]) in opts):
+
                 print(
                     "Running 2nd level testscript "
-                    + testScriptsExt[i] + "...")
-
+                    + "%s%s%s ..." % (bold[1], testScriptsExt[i], bold[0]))
+                time0 = time.time()
                 subprocess.check_call(
                     rpcTestDir + testScriptsExt[i] + flags, shell=True)
+                print("Duration: %s s\n" % (int(time.time() - time0)))
 
         if coverage:
             coverage.report_rpc_coverage()