tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Merge branch 'pr393'

This commit is contained in:
Brian Warner 2017-01-09 16:47:41 -08:00
parent 8913ebfaf7 c83dde8629
commit f42d85b453
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
integration/conftest.py
View File

@ -6,8 +6,8 @@ from sys import stdout as _stdout
from os import mkdir, listdir, unlink from os import mkdir, listdir, unlink
from os.path import join, abspath, curdir, exists from os.path import join, abspath, curdir, exists
from tempfile import mkdtemp, mktemp from tempfile import mkdtemp, mktemp
from shutilwhich import which
from twisted.python.procutils import which
from twisted.internet.defer import Deferred, DeferredList from twisted.internet.defer import Deferred, DeferredList
from twisted.internet.task import deferLater from twisted.internet.task import deferLater
from twisted.internet.error import ProcessExitedAlready from twisted.internet.error import ProcessExitedAlready
@ -73,7 +73,7 @@ def temp_dir(request):
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
def flog_binary(): def flog_binary():
return which('flogtool') return which('flogtool')[0]
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
@ -95,7 +95,7 @@ def flog_gatherer(reactor, temp_dir, flog_binary, request):
twistd_protocol = _MagicTextProtocol("Gatherer waiting at") twistd_protocol = _MagicTextProtocol("Gatherer waiting at")
twistd_process = reactor.spawnProcess( twistd_process = reactor.spawnProcess(
twistd_protocol, twistd_protocol,
which('twistd'), which('twistd')[0],
( (
'twistd', '--nodaemon', '--python', 'twistd', '--nodaemon', '--python',
join(gather_dir, 'gatherer.tac'), join(gather_dir, 'gatherer.tac'),

1
setup.py
View File

@ -279,7 +279,6 @@ setup(name="tahoe-lafs", # also set in __init__.py
"txi2p >= 0.3.1", # in case pip's resolver doesn't work "txi2p >= 0.3.1", # in case pip's resolver doesn't work
"pytest", "pytest",
"pytest-twisted", "pytest-twisted",
"shutilwhich >= 1.1.0", # in Python 3.3 stdlib
], ],
"tor": [ "tor": [
"foolscap[tor] >= 0.12.5", "foolscap[tor] >= 0.12.5",