pytest: update reckless tests with environment variable

to pass location of the reckless utility

Author: endothermicdev

tests/test_reckless.py

@@ -141,18 +141,19 @@ def reckless(cmds: list, dir: PosixPath = None,
     return RecklessResult(r, r.returncode, stdout, stderr)
 
 
-def get_reckless_node(node_factory, options={}, start=False):
-    '''This may be unnecessary, but a preconfigured lightning dir
-    is useful for reckless testing.'''
-    node = node_factory.get_node(options=options, start=start)
-    return node
-
-
 def get_reckless_executable():
     FILE_PATH = Path(os.path.dirname(os.path.realpath(__file__)))
     return str(FILE_PATH.parent / 'tools' / 'reckless')
 
 
+def get_reckless_node(node_factory, options={}, may_fail=False, start=False):
+    '''This may be unnecessary, but a preconfigured lightning dir
+    is useful for reckless testing.'''
+    os.environ['RECKLESS_EXECUTABLE'] = get_reckless_executable()
+    node = node_factory.get_node(options=options, may_fail=may_fail, start=start)
+    return node
+
+
 def test_basic_help():
     '''Validate that argparse provides basic help info.
     This requires no config options passed to reckless.'''
@@ -191,7 +192,7 @@ def test_reckless_version_listconfig(node_factory):
     # Now test via reckless-rpc plugin
     node.start()
     # FIXME: the plugin finds the installed reckless utility rather than the build directory reckless
-    listconfig = node.rpc.reckless(command='listconfig', reckless_executable=get_reckless_executable())
+    listconfig = node.rpc.reckless('listconfig')
     print(listconfig)
     assert listconfig['result']['lightning_dir'] == str(node.lightning_dir)
     assert listconfig['result']['lightning_conf'] == str(node.lightning_dir / NETWORK / 'config')
@@ -485,18 +486,19 @@ def test_reckless_notifications(node_factory):
     reckless(['listconfig', f'--network={NETWORK}', '--json'],
              dir=node.lightning_dir)
     node.start()
-    listconfig_log = node.rpc.reckless(command='listconfig', reckless_executable=get_reckless_executable())['log']
+    listconfig_log = node.rpc.reckless('listconfig')['log']
     # Some trouble escaping the clone url for searching
     listconfig_log.pop(1)
     for log in listconfig_log:
         assert node.daemon.is_in_log(f"reckless_log: {{'reckless_log': {{'log': '{log}'", start=0)
     node.stop()
 
 
+@pytest.mark.timeout(120)
 def test_reckless_usage(node_factory):
     """The reckless rpc response is more useful if it can pass back incorrect
     usage errors."""
-    node = node_factory.get_node(options={}, may_fail=True, start=False)
+    node = get_reckless_node(node_factory, options={}, may_fail=True, start=False)
     node.start(stderr_redir=True)
     r = reckless(['searhc', 'testplugpass'],
                  dir=node.lightning_dir)