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

Merge branch 'master' into 2916.grid-manager-integration-tests.2

Browse Source
This commit is contained in:
meejah
2023-07-29 04:41:03 -06:00
parent e565b9e28c e9f68824a1
commit a9128d89c3
28 changed files with 504 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integration/conftest.py
View File

@ -391,11 +391,9 @@ class ChutneyTorNetwork:
@property
def client_control_endpoint(self) -> str:
print("CONTROL", "tcp:localhost:{}".format(self.client_control_port))
return "tcp:localhost:{}".format(self.client_control_port)
@pytest.fixture(scope='session')
@pytest.mark.skipif(sys.platform.startswith('win'),
reason='Tor tests are unstable on Windows')