Skip to content

Commit

Permalink
qa: Rename cli.args to cli.options
Browse files Browse the repository at this point in the history
That is the name in bitcoin-cli -help
  • Loading branch information
MarcoFalke committed Jan 23, 2018
1 parent b7450cd commit ffffb10
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions test/functional/test_framework/test_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,16 +213,16 @@ class TestNodeCLI():
"""Interface to bitcoin-cli for an individual node"""

def __init__(self, binary, datadir):
self.args = []
self.options = []
self.binary = binary
self.datadir = datadir
self.input = None
self.log = logging.getLogger('TestFramework.bitcoincli')

def __call__(self, *args, input=None):
# TestNodeCLI is callable with bitcoin-cli command-line args
def __call__(self, *options, input=None):
# TestNodeCLI is callable with bitcoin-cli command-line options
cli = TestNodeCLI(self.binary, self.datadir)
cli.args = [str(arg) for arg in args]
cli.options = [str(o) for o in options]
cli.input = input
return cli

Expand All @@ -244,7 +244,7 @@ def send_cli(self, command, *args, **kwargs):
pos_args = [str(arg) for arg in args]
named_args = [str(key) + "=" + str(value) for (key, value) in kwargs.items()]
assert not (pos_args and named_args), "Cannot use positional arguments and named arguments in the same bitcoin-cli call"
p_args = [self.binary, "-datadir=" + self.datadir] + self.args
p_args = [self.binary, "-datadir=" + self.datadir] + self.options
if named_args:
p_args += ["-named"]
p_args += [command] + pos_args + named_args
Expand Down

0 comments on commit ffffb10

Please sign in to comment.