diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2017-06-28 18:09:54 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-06-28 18:09:58 +0200 |
| commit | 416af3edf5b5ab265acf95568f2bc9eabd3d96de (patch) | |
| tree | 321896f153f313d880a20325b710d3e4c699d65f /test/functional/test_framework/test_framework.py | |
| parent | 9a941a10101dc720d7d8b425f7778abf2a1b7c36 (diff) | |
| parent | 4ed36539bcdebb360c730b2492b6435d7cd2476c (diff) | |
| download | bitcoin-416af3edf5b5ab265acf95568f2bc9eabd3d96de.tar.xz | |
Merge #10690: [qa] Bugfix: allow overriding extra_args in ComparisonTestFramework
4ed3653 [qa] Bugfix: allow overriding extra_args in ComparisonTestFramework (Suhas Daftuar)
Tree-SHA512: d8f724b3324aad73a7b15cf87ff394e8d615bf3cd5a394d5715347d833f2ae9ac745a944202986866255eca5fc105ea06ab3abe12e168b67de34482f751c68e2
Diffstat (limited to 'test/functional/test_framework/test_framework.py')
| -rwxr-xr-x | test/functional/test_framework/test_framework.py | 6 |
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 c7fd44b81c..ac0fbe61f8 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -381,8 +381,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)) |