sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #13944: test: Port usage of deprecated optparse module to argparse module

Browse Source 
5654efb187d24eb29a343c720e3937b01457c8b7 Ported usage of deprecated optparse module to argparse module (Kvaciral)

Pull request description:

  The optparse module is deprecated since Python 2,7/3.2 . Recommend usage of the argparse module which improves upon optparse.

Tree-SHA512: ffd0e3e6f3babef1675226b107eeb7a6bab6e5199de572703da9d94e1f69c70d1c9abc353e9664b40670bb4976c06964bb2606deee52f5dfcc619f336ceb8cf8
This commit is contained in:
Wladimir J. van der Laan 2021-07-04 01:41:23 +03:00 committed by UdjinM6
parent 2972dbb951
commit aaf5235b78
No known key found for this signature in database
GPG Key ID: 83592BD1400D58D9
6 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/functional/feature_llmq_signing.py
View File

@ -20,8 +20,8 @@ class LLMQSigningTest(DashTestFramework):
self.set_dash_llmq_test_params(5, 3) self.set_dash_llmq_test_params(5, 3)
def add_options(self, parser): def add_options(self, parser):
parser.add_option("--spork21", dest="spork21", default=False, action="store_true", parser.add_argument("--spork21", dest="spork21", default=False, action="store_true",
help="Test with spork21 enabled") help="Test with spork21 enabled")
def run_test(self): def run_test(self):

6
test/functional/rpc_bind.py
View File

@ -20,9 +20,9 @@ class RPCBindTest(BitcoinTestFramework):
self.add_nodes(self.num_nodes, None) self.add_nodes(self.num_nodes, None)
def add_options(self, parser): def add_options(self, parser):
parser.add_option("--ipv4", action='store_true', dest="run_ipv4", help="Run ipv4 tests only", default=False) parser.add_argument("--ipv4", action='store_true', dest="run_ipv4", help="Run ipv4 tests only", default=False)
parser.add_option("--ipv6", action='store_true', dest="run_ipv6", help="Run ipv6 tests only", default=False) parser.add_argument("--ipv6", action='store_true', dest="run_ipv6", help="Run ipv6 tests only", default=False)
parser.add_option("--nonloopback", action='store_true', dest="run_nonloopback", help="Run non-loopback tests only", default=False) parser.add_argument("--nonloopback", action='store_true', dest="run_nonloopback", help="Run non-loopback tests only", default=False)
def run_bind_test(self, allow_ips, connect_to, addresses, expected): def run_bind_test(self, allow_ips, connect_to, addresses, expected):
''' '''

14
test/functional/rpc_getblockstats.py
View File

@ -34,13 +34,13 @@ class GetblockstatsTest(BitcoinTestFramework):
] ]
def add_options(self, parser): def add_options(self, parser):
parser.add_option('--gen-test-data', dest='gen_test_data', parser.add_argument('--gen-test-data', dest='gen_test_data',
default=False, action='store_true', default=False, action='store_true',
help='Generate test data') help='Generate test data')
parser.add_option('--test-data', dest='test_data', parser.add_argument('--test-data', dest='test_data',
default='data/rpc_getblockstats.json', default='data/rpc_getblockstats.json',
action='store', metavar='FILE', action='store', metavar='FILE',
help='Test data file') help='Test data file')
# def set_test_params(self): # def set_test_params(self):
def set_test_params(self): def set_test_params(self):

58
test/functional/test_framework/test_framework.py
View File

@ -9,7 +9,7 @@ import configparser
import copy import copy
from enum import Enum from enum import Enum
import logging import logging
import optparse import argparse
import os import os
import pdb import pdb
import shutil import shutil
@ -118,35 +118,35 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
def main(self): def main(self):
"""Main function. This should not be overridden by the subclass test scripts.""" """Main function. This should not be overridden by the subclass test scripts."""
parser = optparse.OptionParser(usage="%prog [options]") parser = argparse.ArgumentParser(usage="%(prog)s [options]")
parser.add_option("--nocleanup", dest="nocleanup", default=False, action="store_true", parser.add_argument("--nocleanup", dest="nocleanup", default=False, action="store_true",
help="Leave dashds and test.* datadir on exit or error") help="Leave dashds and test.* datadir on exit or error")
parser.add_option("--noshutdown", dest="noshutdown", default=False, action="store_true", parser.add_argument("--noshutdown", dest="noshutdown", default=False, action="store_true",
help="Don't stop dashds after the test execution") help="Don't stop dashds after the test execution")
parser.add_option("--cachedir", dest="cachedir", default=os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + "/../../cache"), parser.add_argument("--cachedir", dest="cachedir", default=os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + "/../../cache"),
help="Directory for caching pregenerated datadirs (default: %default)") help="Directory for caching pregenerated datadirs (default: %(default)s)")
parser.add_option("--tmpdir", dest="tmpdir", help="Root directory for datadirs") parser.add_argument("--tmpdir", dest="tmpdir", help="Root directory for datadirs")
parser.add_option("-l", "--loglevel", dest="loglevel", default="INFO", parser.add_argument("-l", "--loglevel", dest="loglevel", default="INFO",
help="log events at this level and higher to the console. Can be set to DEBUG, INFO, WARNING, ERROR or CRITICAL. Passing --loglevel DEBUG will output all logs to console. Note that logs at all levels are always written to the test_framework.log file in the temporary test directory.") help="log events at this level and higher to the console. Can be set to DEBUG, INFO, WARNING, ERROR or CRITICAL. Passing --loglevel DEBUG will output all logs to console. Note that logs at all levels are always written to the test_framework.log file in the temporary test directory.")
parser.add_option("--tracerpc", dest="trace_rpc", default=False, action="store_true", parser.add_argument("--tracerpc", dest="trace_rpc", default=False, action="store_true",
help="Print out all RPC calls as they are made") help="Print out all RPC calls as they are made")
parser.add_option("--portseed", dest="port_seed", default=os.getpid(), type='int', parser.add_argument("--portseed", dest="port_seed", default=os.getpid(), type=int,
help="The seed to use for assigning port numbers (default: current process id)") help="The seed to use for assigning port numbers (default: current process id)")
parser.add_option("--coveragedir", dest="coveragedir", parser.add_argument("--coveragedir", dest="coveragedir",
help="Write tested RPC commands into this directory") help="Write tested RPC commands into this directory")
parser.add_option("--configfile", dest="configfile", parser.add_argument("--configfile", dest="configfile",
default=os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + "/../../config.ini"), default=os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + "/../../config.ini"),
help="Location of the test framework config file (default: %default)") help="Location of the test framework config file (default: %(default)s)")
parser.add_option("--pdbonfailure", dest="pdbonfailure", default=False, action="store_true", parser.add_argument("--pdbonfailure", dest="pdbonfailure", default=False, action="store_true",
help="Attach a python debugger if test fails") help="Attach a python debugger if test fails")
parser.add_option("--usecli", dest="usecli", default=False, action="store_true", parser.add_argument("--usecli", dest="usecli", default=False, action="store_true",
help="use dash-cli instead of RPC for all commands") help="use dash-cli instead of RPC for all commands")
parser.add_option("--dashd-arg", dest="dashd_extra_args", default=[], type='string', action='append', parser.add_argument("--dashd-arg", dest="dashd_extra_args", default=[], action="append",
help="Pass extra args to all dashd instances") help="Pass extra args to all dashd instances")
parser.add_option("--timeoutscale", dest="timeout_scale", default=1, type='int' , parser.add_argument("--timeoutscale", dest="timeout_scale", default=1, type=int,
help="Scale the test timeouts by multiplying them with the here provided value (defaul: 1)") help="Scale the test timeouts by multiplying them with the here provided value (default: %(default)s)")
self.add_options(parser) self.add_options(parser)
(self.options, self.args) = parser.parse_args() self.options = parser.parse_args()
if self.options.timeout_scale < 1: if self.options.timeout_scale < 1:
raise RuntimeError("--timeoutscale can't be less than 1") raise RuntimeError("--timeoutscale can't be less than 1")

4
test/functional/wallet_txn_clone.py
View File

@ -16,8 +16,8 @@ class TxnMallTest(BitcoinTestFramework):
self.num_nodes = 4 self.num_nodes = 4
def add_options(self, parser): def add_options(self, parser):
parser.add_option("--mineblock", dest="mine_block", default=False, action="store_true", parser.add_argument("--mineblock", dest="mine_block", default=False, action="store_true",
help="Test double-spend of 1-confirmed transaction") help="Test double-spend of 1-confirmed transaction")
def setup_network(self): def setup_network(self):
# Start with split network: # Start with split network:

4
test/functional/wallet_txn_doublespend.py
View File

@ -18,8 +18,8 @@ class TxnMallTest(BitcoinTestFramework):
self.num_nodes = 4 self.num_nodes = 4
def add_options(self, parser): def add_options(self, parser):
parser.add_option("--mineblock", dest="mine_block", default=False, action="store_true", parser.add_argument("--mineblock", dest="mine_block", default=False, action="store_true",
help="Test double-spend of 1-confirmed transaction") help="Test double-spend of 1-confirmed transaction")
def setup_network(self): def setup_network(self):
# Start with split network: # Start with split network: