aboutsummaryrefslogtreecommitdiff
path: root/test/functional/test_framework/test_framework.py
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2019-04-09 11:46:05 -0400
committerMarcoFalke <falke.marco@gmail.com>2019-04-09 12:08:26 -0400
commitfafe008cb407cd3830b0ae25a4e9f4400ff66b6e (patch)
treee93eb5f9cc123b6aab096458fa2498cf9d4dc2f4 /test/functional/test_framework/test_framework.py
parentfa4680ed0996a7c621265a34392c3eca827b2e48 (diff)
downloadbitcoin-fafe008cb407cd3830b0ae25a4e9f4400ff66b6e.tar.xz
test: Pass at most one node group to sync_all
Diffstat (limited to 'test/functional/test_framework/test_framework.py')
-rwxr-xr-xtest/functional/test_framework/test_framework.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
index 15d2e08c93..81ab571a40 100755
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -396,7 +396,8 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
"""
disconnect_nodes(self.nodes[1], 2)
disconnect_nodes(self.nodes[2], 1)
- self.sync_all([self.nodes[:2], self.nodes[2:]])
+ self.sync_all(self.nodes[:2])
+ self.sync_all(self.nodes[2:])
def join_network(self):
"""
@@ -405,13 +406,9 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
connect_nodes_bi(self.nodes, 1, 2)
self.sync_all()
- def sync_all(self, node_groups=None):
- if not node_groups:
- node_groups = [self.nodes]
-
- for group in node_groups:
- sync_blocks(group)
- sync_mempools(group)
+ def sync_all(self, nodes=None, **kwargs):
+ sync_blocks(nodes or self.nodes, **kwargs)
+ sync_mempools(nodes or self.nodes, **kwargs)
# Private helper methods. These should not be accessed by the subclass test scripts.