mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-02-21 02:01:31 +00:00
Merge remote-tracking branch 'origin/master' into 3937-integration-http-storage
This commit is contained in:
commit
709ea62f62
@ -20,7 +20,7 @@ class History(object):
|
||||
MAX_UPLOAD_STATUSES = 10
|
||||
MAX_MAPUPDATE_STATUSES = 20
|
||||
MAX_PUBLISH_STATUSES = 20
|
||||
MAX_RETRIEVE_STATUSES = 20
|
||||
MAX_RETRIEVE_STATUSES = 40
|
||||
|
||||
def __init__(self, stats_provider=None):
|
||||
self.stats_provider = stats_provider
|
||||
|
@ -144,6 +144,10 @@ class PinningHTTPSValidation(AsyncTestCase):
|
||||
response = await self.request(url, certificate)
|
||||
self.assertEqual(await response.content(), b"YOYODYNE")
|
||||
|
||||
# We keep getting TLSMemoryBIOProtocol being left around, so try harder
|
||||
# to wait for it to finish.
|
||||
await deferLater(reactor, 0.01)
|
||||
|
||||
@async_to_deferred
|
||||
async def test_server_certificate_has_wrong_hash(self):
|
||||
"""
|
||||
|
Loading…
x
Reference in New Issue
Block a user