diff --git a/test/functional/abc-mempool-accept-txn.py b/test/functional/abc-mempool-accept-txn.py --- a/test/functional/abc-mempool-accept-txn.py +++ b/test/functional/abc-mempool-accept-txn.py @@ -52,8 +52,8 @@ self.add_nodes(self.num_nodes, self.extra_args) self.start_nodes() - def add_options(self, parser): - super().add_options(parser) + def add_arguments(self, parser): + super().add_arguments(parser) parser.add_argument( "--runbarelyexpensive", dest="runbarelyexpensive", default=True) diff --git a/test/functional/abc-p2p-compactblocks.py b/test/functional/abc-p2p-compactblocks.py --- a/test/functional/abc-p2p-compactblocks.py +++ b/test/functional/abc-p2p-compactblocks.py @@ -82,9 +82,9 @@ '-maxmempool=99999', "-excessiveblocksize=%d" % self.excessive_block_size]] - def add_options(self, parser): - super().add_options(parser) - parser.add_option( + def add_arguments(self, parser): + super().add_arguments(parser) + parser.add_argument( "--runbarelyexpensive", dest="runbarelyexpensive", default=True) def run_test(self): diff --git a/test/functional/abc-p2p-fullblocktest.py b/test/functional/abc-p2p-fullblocktest.py --- a/test/functional/abc-p2p-fullblocktest.py +++ b/test/functional/abc-p2p-fullblocktest.py @@ -49,8 +49,8 @@ "-replayprotectionactivationtime=%d" % REPLAY_PROTECTION_START_TIME, "-excessiveblocksize=%d" % self.excessive_block_size]] - def add_options(self, parser): - super().add_options(parser) + def add_arguments(self, parser): + super().add_arguments(parser) parser.add_argument( "--runbarelyexpensive", dest="runbarelyexpensive", default=True) diff --git a/test/functional/example_test.py b/test/functional/example_test.py --- a/test/functional/example_test.py +++ b/test/functional/example_test.py @@ -77,7 +77,7 @@ class ExampleTest(BitcoinTestFramework): # Each functional test is a subclass of the BitcoinTestFramework class. - # Override the set_test_params(), add_options(), setup_chain(), setup_network() + # Override the set_test_params(), add_arguments(), setup_chain(), setup_network() # and setup_nodes() methods to customize the test setup as required. def set_test_params(self): @@ -91,10 +91,10 @@ # self.log.info("I've finished set_test_params") # Oops! Can't run self.log before run_test() - # Use add_options() to add specific command-line options for your test. + # Use add_arguments() to add specific command-line options for your test. # In practice this is not used very much, since the tests are mostly written # to be run in automated environments without command-line options. - # def add_options() + # def add_arguments() # pass # Use setup_chain() to customize the node data directories. In practice diff --git a/test/functional/p2p-acceptblock.py b/test/functional/p2p-acceptblock.py --- a/test/functional/p2p-acceptblock.py +++ b/test/functional/p2p-acceptblock.py @@ -68,7 +68,7 @@ class AcceptBlockTest(BitcoinTestFramework): - def add_options(self, parser): + def add_arguments(self, parser): parser.add_argument("--testbinary", dest="testbinary", default=os.getenv("BITCOIND", "bitcoind"), help="bitcoind binary to test") diff --git a/test/functional/p2p-fullblocktest.py b/test/functional/p2p-fullblocktest.py --- a/test/functional/p2p-fullblocktest.py +++ b/test/functional/p2p-fullblocktest.py @@ -70,8 +70,8 @@ self.tip = None self.blocks = {} - def add_options(self, parser): - super().add_options(parser) + def add_arguments(self, parser): + super().add_arguments(parser) parser.add_argument( "--runbarelyexpensive", dest="runbarelyexpensive", default=True) diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -53,7 +53,7 @@ Individual tests can also override the following methods to customize the test setup: - - add_options() + - add_arguments() - setup_chain() - setup_network() - setup_nodes() @@ -94,7 +94,7 @@ help="Location of the test framework config file") parser.add_argument("--pdbonfailure", dest="pdbonfailure", default=False, action="store_true", help="Attach a python debugger if test fails") - self.add_options(parser) + self.add_arguments(parser) self.options = parser.parse_args() self.set_test_params() @@ -190,7 +190,7 @@ """Tests must this method to change default values for number of nodes, topology, etc""" raise NotImplementedError - def add_options(self, parser): + def add_arguments(self, parser): """Override this method to add command-line options to the test""" pass @@ -483,7 +483,7 @@ self.num_nodes = 2 self.setup_clean_chain = True - def add_options(self, parser): + def add_arguments(self, parser): parser.add_argument("--testbinary", dest="testbinary", default=os.getenv("BITCOIND", "bitcoind"), help="bitcoind binary to test") diff --git a/test/functional/txn_clone.py b/test/functional/txn_clone.py --- a/test/functional/txn_clone.py +++ b/test/functional/txn_clone.py @@ -12,7 +12,7 @@ def set_test_params(self): self.num_nodes = 4 - def add_options(self, parser): + def add_arguments(self, parser): parser.add_argument("--mineblock", dest="mine_block", default=False, action="store_true", help="Test double-spend of 1-confirmed transaction") diff --git a/test/functional/txn_doublespend.py b/test/functional/txn_doublespend.py --- a/test/functional/txn_doublespend.py +++ b/test/functional/txn_doublespend.py @@ -12,7 +12,7 @@ def set_test_params(self): self.num_nodes = 4 - def add_options(self, parser): + def add_arguments(self, parser): parser.add_argument("--mineblock", dest="mine_block", default=False, action="store_true", help="Test double-spend of 1-confirmed transaction")