Merge remote-tracking branch 'origin/master' into release-1.17.0

This commit is contained in:
meejah 2021-12-06 11:27:34 -07:00
commit c3e574b2ee
2 changed files with 15 additions and 0 deletions

0
newsfragments/3850.minor Normal file
View File

View File

@ -63,7 +63,22 @@ class HTTPTests(TestCase):
def test_version(self): def test_version(self):
""" """
The client can return the version. The client can return the version.
We ignore available disk space and max immutable share size, since that
might change across calls.
""" """
version = yield self.client.get_version() version = yield self.client.get_version()
version[b"http://allmydata.org/tahoe/protocols/storage/v1"].pop(
b"available-space"
)
version[b"http://allmydata.org/tahoe/protocols/storage/v1"].pop(
b"maximum-immutable-share-size"
)
expected_version = self.storage_server.remote_get_version() expected_version = self.storage_server.remote_get_version()
expected_version[b"http://allmydata.org/tahoe/protocols/storage/v1"].pop(
b"available-space"
)
expected_version[b"http://allmydata.org/tahoe/protocols/storage/v1"].pop(
b"maximum-immutable-share-size"
)
self.assertEqual(version, expected_version) self.assertEqual(version, expected_version)