From 36b626867087e9fae6d85f926248997ebff327b7 Mon Sep 17 00:00:00 2001 From: John Newbery Date: Fri, 9 Jun 2017 16:35:17 -0400 Subject: [tests] TestNode: separate add_node from start_node Separates the act of creating a TestNode object from starting the node. The test_framework now keeps track of its list of TestNodes, and test writers can call start_node() and stop_node() without having to update the self.nodes list. --- test/functional/receivedby.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'test/functional/receivedby.py') diff --git a/test/functional/receivedby.py b/test/functional/receivedby.py index 19d99c9c9e..b165834169 100755 --- a/test/functional/receivedby.py +++ b/test/functional/receivedby.py @@ -28,11 +28,7 @@ class ReceivedByTest(BitcoinTestFramework): super().__init__() self.num_nodes = 4 self.setup_clean_chain = False - - def setup_nodes(self): - #This test requires mocktime self.enable_mocktime() - self.nodes = self.start_nodes(self.num_nodes, self.options.tmpdir) def run_test(self): ''' -- cgit v1.2.3 From 5448a1471d6fc638a2220ea5a2f3782172efe14c Mon Sep 17 00:00:00 2001 From: John Newbery Date: Fri, 9 Jun 2017 18:21:21 -0400 Subject: [tests] don't override __init__() in individual tests Almost all test scripts currently need to override the __init__() method. When they do that they need to call into super().__init__() as the base class does some generic initialization. This commit makes the base class __init__() call into set_test_params() method. Individual test cases can override set_test_params() to setup their test parameters. --- test/functional/receivedby.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'test/functional/receivedby.py') diff --git a/test/functional/receivedby.py b/test/functional/receivedby.py index b165834169..48eb1c51b5 100755 --- a/test/functional/receivedby.py +++ b/test/functional/receivedby.py @@ -23,11 +23,7 @@ def get_sub_array_from_array(object_array, to_match): return [] class ReceivedByTest(BitcoinTestFramework): - - def __init__(self): - super().__init__() - self.num_nodes = 4 - self.setup_clean_chain = False + def set_test_params(self): self.enable_mocktime() def run_test(self): -- cgit v1.2.3 From 7148b74dc39110f53c665b94fa9d994c6ad6dc1c Mon Sep 17 00:00:00 2001 From: John Newbery Date: Thu, 24 Aug 2017 11:11:56 -0400 Subject: [tests] Functional tests must explicitly set num_nodes --- test/functional/receivedby.py | 1 + 1 file changed, 1 insertion(+) (limited to 'test/functional/receivedby.py') diff --git a/test/functional/receivedby.py b/test/functional/receivedby.py index 48eb1c51b5..db6fc86b82 100755 --- a/test/functional/receivedby.py +++ b/test/functional/receivedby.py @@ -24,6 +24,7 @@ def get_sub_array_from_array(object_array, to_match): class ReceivedByTest(BitcoinTestFramework): def set_test_params(self): + self.num_nodes = 2 self.enable_mocktime() def run_test(self): -- cgit v1.2.3