aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSuhas Daftuar <sdaftuar@gmail.com>2017-06-28 08:53:20 -0400
committerSuhas Daftuar <sdaftuar@gmail.com>2017-06-28 08:53:20 -0400
commit4ed36539bcdebb360c730b2492b6435d7cd2476c (patch)
treeec6d94ac022b276338e858d425527bd6d7b6af9d
parent300f8e7a828f3ffaa3a3e9d979a6dc90f15d0203 (diff)
downloadbitcoin-4ed36539bcdebb360c730b2492b6435d7cd2476c.tar.xz
[qa] Bugfix: allow overriding extra_args in ComparisonTestFramework
-rwxr-xr-xtest/functional/test_framework/test_framework.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
index 67abf35687..439a9bb8ba 100755
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -380,8 +380,10 @@ class ComparisonTestFramework(BitcoinTestFramework):
help="bitcoind binary to use for reference nodes (if any)")
def setup_network(self):
+ extra_args = [['-whitelist=127.0.0.1']]*self.num_nodes
+ if hasattr(self, "extra_args"):
+ extra_args = self.extra_args
self.nodes = self.start_nodes(
- self.num_nodes, self.options.tmpdir,
- extra_args=[['-whitelist=127.0.0.1']] * self.num_nodes,
+ self.num_nodes, self.options.tmpdir, extra_args,
binary=[self.options.testbinary] +
[self.options.refbinary]*(self.num_nodes-1))