From 1575181ef51a6a527d781c0865c9a397a423024b Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 24 Jan 2017 14:37:56 +1030 Subject: [PATCH] pytest: don't assume paths of valgrind and bitcoind. In particular, my bitcoind is in /usr/local/bin Signed-off-by: Rusty Russell --- tests/test_lightningd.py | 2 +- tests/utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_lightningd.py b/tests/test_lightningd.py index 36bd0778e..e3c39f5ed 100644 --- a/tests/test_lightningd.py +++ b/tests/test_lightningd.py @@ -73,7 +73,7 @@ class NodeFactory(object): self.nodes.append(node) if VALGRIND: node.daemon.cmd_line = [ - '/usr/bin/valgrind', + 'valgrind', '-q', '--error-exitcode=7', '--log-file={}/valgrind-errors'.format(node.daemon.lightning_dir) diff --git a/tests/utils.py b/tests/utils.py index c8bc89156..6328dab55 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -133,7 +133,7 @@ class BitcoinD(TailableProc): os.makedirs(regtestdir) self.cmd_line = [ - '/usr/bin/bitcoind', + 'bitcoind', '-datadir={}'.format(bitcoin_dir), '-printtoconsole', '-server',