sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[qa] Use single cache dir for chains

Browse Source
This commit is contained in:
MarcoFalke 2016-08-07 23:06:27 +02:00
parent fa2d68f79c
commit fad8cf63e5
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -103,10 +103,9 @@ linux-build
win32-build win32-build
qa/pull-tester/run-bitcoind-for-test.sh qa/pull-tester/run-bitcoind-for-test.sh
qa/pull-tester/tests_config.py qa/pull-tester/tests_config.py
qa/pull-tester/cache/*
qa/pull-tester/test.*/* qa/pull-tester/test.*/*
qa/tmp qa/tmp
cache/ qa/cache/*
share/BitcoindComparisonTool.jar share/BitcoindComparisonTool.jar
!src/leveldb*/Makefile !src/leveldb*/Makefile

1
qa/pull-tester/rpc-tests.py
View File

@ -192,6 +192,7 @@ def runtests():
coverage = RPCCoverage() coverage = RPCCoverage()
print("Initializing coverage directory at %s\n" % coverage.dir) print("Initializing coverage directory at %s\n" % coverage.dir)
flags = ["--srcdir=%s/src" % BUILDDIR] + passon_args flags = ["--srcdir=%s/src" % BUILDDIR] + passon_args
flags.append("--cachedir=%s/qa/cache" % BUILDDIR)
if coverage: if coverage:
flags.append(coverage.flag) flags.append(coverage.flag)

4
qa/rpc-tests/test_framework/test_framework.py
View File

@ -47,7 +47,7 @@ class BitcoinTestFramework(object):
if self.setup_clean_chain: if self.setup_clean_chain:
initialize_chain_clean(self.options.tmpdir, self.num_nodes) initialize_chain_clean(self.options.tmpdir, self.num_nodes)
else: else:
initialize_chain(self.options.tmpdir, self.num_nodes) initialize_chain(self.options.tmpdir, self.num_nodes, self.options.cachedir)
def setup_nodes(self): def setup_nodes(self):
return start_nodes(self.num_nodes, self.options.tmpdir) return start_nodes(self.num_nodes, self.options.tmpdir)
@ -108,6 +108,8 @@ class BitcoinTestFramework(object):
help="Don't stop bitcoinds after the test execution") help="Don't stop bitcoinds after the test execution")
parser.add_option("--srcdir", dest="srcdir", default=os.path.normpath(os.path.dirname(os.path.realpath(__file__))+"/../../../src"), parser.add_option("--srcdir", dest="srcdir", default=os.path.normpath(os.path.dirname(os.path.realpath(__file__))+"/../../../src"),
help="Source directory containing bitcoind/bitcoin-cli (default: %default)") help="Source directory containing bitcoind/bitcoin-cli (default: %default)")
parser.add_option("--cachedir", dest="cachedir", default=os.path.normpath(os.path.dirname(os.path.realpath(__file__))+"/../../cache"),
help="Directory for caching pregenerated datadirs")
parser.add_option("--tmpdir", dest="tmpdir", default=tempfile.mkdtemp(prefix="test"), parser.add_option("--tmpdir", dest="tmpdir", default=tempfile.mkdtemp(prefix="test"),
help="Root directory for datadirs") help="Root directory for datadirs")
parser.add_option("--tracerpc", dest="trace_rpc", default=False, action="store_true", parser.add_option("--tracerpc", dest="trace_rpc", default=False, action="store_true",

20
qa/rpc-tests/test_framework/util.py
View File

@ -193,7 +193,7 @@ def wait_for_bitcoind_start(process, url, i):
raise # unkown JSON RPC exception raise # unkown JSON RPC exception
time.sleep(0.25) time.sleep(0.25)
def initialize_chain(test_dir, num_nodes): def initialize_chain(test_dir, num_nodes, cachedir):
""" """
Create a cache of a 200-block-long chain (with wallet) for MAX_NODES Create a cache of a 200-block-long chain (with wallet) for MAX_NODES
Afterward, create num_nodes copies from the cache Afterward, create num_nodes copies from the cache
@ -202,7 +202,7 @@ def initialize_chain(test_dir, num_nodes):
assert num_nodes <= MAX_NODES assert num_nodes <= MAX_NODES
create_cache = False create_cache = False
for i in range(MAX_NODES): for i in range(MAX_NODES):
if not os.path.isdir(os.path.join('cache', 'node'+str(i))): if not os.path.isdir(os.path.join(cachedir, 'node'+str(i))):
create_cache = True create_cache = True
break break
@ -210,12 +210,12 @@ def initialize_chain(test_dir, num_nodes):
#find and delete old cache directories if any exist #find and delete old cache directories if any exist
for i in range(MAX_NODES): for i in range(MAX_NODES):
if os.path.isdir(os.path.join("cache","node"+str(i))): if os.path.isdir(os.path.join(cachedir,"node"+str(i))):
shutil.rmtree(os.path.join("cache","node"+str(i))) shutil.rmtree(os.path.join(cachedir,"node"+str(i)))
# Create cache directories, run bitcoinds: # Create cache directories, run bitcoinds:
for i in range(MAX_NODES): for i in range(MAX_NODES):
datadir=initialize_datadir("cache", i) datadir=initialize_datadir(cachedir, i)
args = [ os.getenv("BITCOIND", "bitcoind"), "-server", "-keypool=1", "-datadir="+datadir, "-discover=0" ] args = [ os.getenv("BITCOIND", "bitcoind"), "-server", "-keypool=1", "-datadir="+datadir, "-discover=0" ]
if i > 0: if i > 0:
args.append("-connect=127.0.0.1:"+str(p2p_port(0))) args.append("-connect=127.0.0.1:"+str(p2p_port(0)))
@ -257,13 +257,13 @@ def initialize_chain(test_dir, num_nodes):
wait_bitcoinds() wait_bitcoinds()
disable_mocktime() disable_mocktime()
for i in range(MAX_NODES): for i in range(MAX_NODES):
os.remove(log_filename("cache", i, "debug.log")) os.remove(log_filename(cachedir, i, "debug.log"))
os.remove(log_filename("cache", i, "db.log")) os.remove(log_filename(cachedir, i, "db.log"))
os.remove(log_filename("cache", i, "peers.dat")) os.remove(log_filename(cachedir, i, "peers.dat"))
os.remove(log_filename("cache", i, "fee_estimates.dat")) os.remove(log_filename(cachedir, i, "fee_estimates.dat"))
for i in range(num_nodes): for i in range(num_nodes):
from_dir = os.path.join("cache", "node"+str(i)) from_dir = os.path.join(cachedir, "node"+str(i))
to_dir = os.path.join(test_dir, "node"+str(i)) to_dir = os.path.join(test_dir, "node"+str(i))
shutil.copytree(from_dir, to_dir) shutil.copytree(from_dir, to_dir)
initialize_datadir(test_dir, i) # Overwrite port/rpcport in bitcoin.conf initialize_datadir(test_dir, i) # Overwrite port/rpcport in bitcoin.conf