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

Merge remote-tracking branch 'origin/master' into 3999.structure-config-manipulation

Browse Source
This commit is contained in:
Itamar Turner-Trauring
2023-05-01 12:52:18 -04:00
parent c0e49064ce 4edf98b8fb
commit bc2506c3e2
26 changed files with 357 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
integration/conftest.py
View File

@ -4,6 +4,7 @@ Ported to Python 3.
from __future__ import annotations
import os
import sys
import shutil
from time import sleep
@ -49,6 +50,11 @@ from .util import (
)
from allmydata.node import read_config
# No reason for HTTP requests to take longer than two minutes in the
# integration tests. See allmydata/scripts/common_http.py for usage.
os.environ["__TAHOE_CLI_HTTP_TIMEOUT"] = "120"
# pytest customization hooks
def pytest_addoption(parser):