diff options
-rw-r--r-- | testing/tests/conftest.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/testing/tests/conftest.py b/testing/tests/conftest.py index 40ad5568..1b8d380a 100644 --- a/testing/tests/conftest.py +++ b/testing/tests/conftest.py @@ -117,8 +117,12 @@ class SoledadServer(object): def start(self): self._create_conf_file() # start the server + executable = 'twistd' + if 'VIRTUAL_ENV' not in os.environ: + executable = os.path.join( + os.path.dirname(os.environ['_']), 'twistd') check_call([ - 'twistd', + executable, '--logfile=%s' % self._logfile, '--pidfile=%s' % self._pidfile, 'web', |