ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-13 22:03:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pass the whole parent environment down to the child

Browse Source 
You never know what is in here that is totally essential to the operation of
some random thing. :(
This commit is contained in:
Jean-Paul Calderone 2019-08-02 16:49:50 -06:00
parent 3f9f4537b9
commit 7f1673596f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
integration/conftest.py
View File

@ -3,7 +3,7 @@ from __future__ import print_function
import sys
import shutil
from time import sleep
from os import mkdir, listdir
from os import mkdir, listdir, environ
from os.path import join, exists
from tempfile import mkdtemp, mktemp
from functools import partial
@ -467,7 +467,8 @@ def chutney(reactor, temp_dir):
'/usr/bin/git', 'clone', '--depth=1',
'https://git.torproject.org/chutney.git',
chutney_dir,
)
),
env=environ,
)
pytest_twisted.blockon(proto.done)
return chutney_dir
@ -483,6 +484,8 @@ def tor_network(reactor, temp_dir, chutney, request):
# ./chutney configure networks/basic
# ./chutney start networks/basic
env = environ.copy()
env.update({"PYTHONPATH": join(chutney_dir, "lib")})
proto = _DumpOutputProtocol(None)
reactor.spawnProcess(
proto,
@ -492,7 +495,7 @@ def tor_network(reactor, temp_dir, chutney, request):
join(chutney_dir, 'networks', 'basic'),
),
path=join(chutney_dir),
env={"PYTHONPATH": join(chutney_dir, "lib")},
env=env,
)
pytest_twisted.blockon(proto.done)
@ -505,7 +508,7 @@ def tor_network(reactor, temp_dir, chutney, request):
join(chutney_dir, 'networks', 'basic'),
),
path=join(chutney_dir),
env={"PYTHONPATH": join(chutney_dir, "lib")},
env=env,
)
pytest_twisted.blockon(proto.done)
@ -519,7 +522,7 @@ def tor_network(reactor, temp_dir, chutney, request):
join(chutney_dir, 'networks', 'basic'),
),
path=join(chutney_dir),
env={"PYTHONPATH": join(chutney_dir, "lib")},
env=env,
)
try:
pytest_twisted.blockon(proto.done)
@ -538,7 +541,7 @@ def tor_network(reactor, temp_dir, chutney, request):
join(chutney_dir, 'networks', 'basic'),
),
path=join(chutney_dir),
env={"PYTHONPATH": join(chutney_dir, "lib")},
env=env,
)
pytest_twisted.blockon(proto.done)
request.addfinalizer(cleanup)