Merge pull request #7135

fa3a38a [qa] pull-tester: Cleanup (run keypool, tidy stdout) (MarcoFalke)
This commit is contained in:
Wladimir J. van der Laan 2015-12-01 09:56:00 +01:00
commit eb3d1b3487
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -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
@ -93,6 +98,7 @@ testScripts = [
'blockchain.py',
'disablewallet.py',
'sendheaders.py',
'keypool.py',
]
testScriptsExt = [
'bip65-cltv.py',
@ -106,7 +112,6 @@ testScriptsExt = [
'pruning.py',
'forknotify.py',
'invalidateblock.py',
'keypool.py',
# 'rpcbind_test.py', #temporary, bug in libevent, see #6655
'smartfees.py',
'maxblocksinflight.py',
@ -127,7 +132,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/'
@ -142,10 +147,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
@ -157,12 +164,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()