Merge branch '2916.grid-manager-integration-tests.2' of github.com:tahoe-lafs/tahoe-lafs into 2916.grid-manager-integration-tests.2

This commit is contained in:
meejah 2023-08-02 15:14:02 -06:00
commit c0a9ff9c88

View File

@ -375,14 +375,14 @@ def chutney(reactor, temp_dir: str) -> tuple[str, dict[str, str]]:
return chutney_dir, {"PYTHONPATH": join(chutney_dir, "lib")} return chutney_dir, {"PYTHONPATH": join(chutney_dir, "lib")}
@define @frozen
class ChutneyTorNetwork: class ChutneyTorNetwork:
""" """
Represents a running Chutney (tor) network. Returned by the Represents a running Chutney (tor) network. Returned by the
"tor_network" fixture. "tor_network" fixture.
""" """
dir: FilePath dir: FilePath
environ: dict environ: Mapping[str, str]
client_control_port: int client_control_port: int
@property @property