ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-17 06:48:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Propagate parent environment to children in the integration tests

Browse Source
This commit is contained in:
Jean-Paul Calderone
2023-03-27 14:06:16 -04:00
parent c478160988
commit 8613e36bae
4 changed files with 23 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
integration/conftest.py
View File

@ -146,7 +146,8 @@ def flog_gatherer(reactor, temp_dir, flog_binary, request):
'--location', 'tcp:localhost:3117',
'--port', '3117',
gather_dir,
)
),
env=environ,
)
pytest_twisted.blockon(out_protocol.done)
@ -159,6 +160,7 @@ def flog_gatherer(reactor, temp_dir, flog_binary, request):
join(gather_dir, 'gatherer.tac'),
),
path=gather_dir,
env=environ,
)
pytest_twisted.blockon(twistd_protocol.magic_seen)
@ -177,6 +179,7 @@ def flog_gatherer(reactor, temp_dir, flog_binary, request):
(
'flogtool', 'dump', join(temp_dir, 'flog_gather', flogs[0])
),
env=environ,
)
print("Waiting for flogtool to complete")
try: