aboutsummaryrefslogtreecommitdiff
path: root/test/functional/test_runner.py
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2019-11-15 11:38:27 -0500
committerfanquake <fanquake@gmail.com>2019-11-15 16:03:47 -0500
commit1c23ea5fe67b88fd72a1ff640dd1bbb21a34fbf4 (patch)
treee10cbd8a0a19cb87fef1506e7d18dde9f1b38b61 /test/functional/test_runner.py
parentb90dad5143993d266cdfeece898164d648bbbd78 (diff)
downloadbitcoin-1c23ea5fe67b88fd72a1ff640dd1bbb21a34fbf4.tar.xz
test: fix bitcoind already running warnings on macOS
On macOS, pidof installed via brew returns b'' rather than None. Account for this, to remove spurious warnings from the test_runner.
Diffstat (limited to 'test/functional/test_runner.py')
-rwxr-xr-xtest/functional/test_runner.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index 9b4a5d2030..4156e22720 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -364,9 +364,10 @@ def main():
def run_tests(*, test_list, src_dir, build_dir, tmpdir, jobs=1, enable_coverage=False, args=None, combined_logs_len=0, failfast=False, runs_ci, use_term_control):
args = args or []
- # Warn if bitcoind is already running (unix only)
+ # Warn if bitcoind is already running
+ # pidof might fail or return an empty string if bitcoind is not running
try:
- if subprocess.check_output(["pidof", "bitcoind"]) is not None:
+ if subprocess.check_output(["pidof", "bitcoind"]) not in [b'']:
print("%sWARNING!%s There is already a bitcoind process running on this system. Tests may fail unexpectedly due to resource contention!" % (BOLD[1], BOLD[0]))
except (OSError, subprocess.SubprocessError):
pass