From c83dde8629398b2bfccd2198f4f342359073d945 Mon Sep 17 00:00:00 2001 From: David Stainton Date: Mon, 9 Jan 2017 19:54:51 +0000 Subject: [PATCH] Use first element returned by which --- integration/conftest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration/conftest.py b/integration/conftest.py index e92e3eb5a..19f5600d1 100644 --- a/integration/conftest.py +++ b/integration/conftest.py @@ -73,7 +73,7 @@ def temp_dir(request): @pytest.fixture(scope='session') def flog_binary(): - return which('flogtool') + return which('flogtool')[0] @pytest.fixture(scope='session') @@ -95,7 +95,7 @@ def flog_gatherer(reactor, temp_dir, flog_binary, request): twistd_protocol = _MagicTextProtocol("Gatherer waiting at") twistd_process = reactor.spawnProcess( twistd_protocol, - which('twistd'), + which('twistd')[0], ( 'twistd', '--nodaemon', '--python', join(gather_dir, 'gatherer.tac'),