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

tahoe-lafs · Dec 6, 2021 · c3e574b · c3e574b
2 parents 5f6579d + f977ce2
commit c3e574b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/newsfragments/3850.minor b/newsfragments/3850.minor
diff --git a/src/allmydata/test/test_storage_http.py b/src/allmydata/test/test_storage_http.py
@@ -63,7 +63,22 @@ def test_bad_authentication(self):
     def test_version(self):
         """
         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[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[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)