Changeset 1a4744d in trunk

Timestamp:

2020-09-18T15:32:45Z (4 years ago)

Author:

Itamar Turner-Trauring <itamar@…>

Branches:

master

Children:

a0ff941, c5ce988

Parents:

3d79793 (diff), 02cb451a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch '3415.storage-server-python-3' into 3416.test-encode-python-3

File:

• src/allmydata/test/test_storage.py (modified) (2 diffs)

src/allmydata/test/test_storage.py ¶

@@ -367 +367 @@
         ss = self.create("test_declares_fixed_1528")
         ver = ss.remote_get_version()
-        sv1 = ver['http://allmydata.org/tahoe/protocols/storage/v1']
-        self.failUnless(sv1.get('prevents-read-past-end-of-share-data'), sv1)
+        sv1 = ver[b'http://allmydata.org/tahoe/protocols/storage/v1']
+        self.failUnless(sv1.get(b'prevents-read-past-end-of-share-data'), sv1)
 
     def test_declares_maximum_share_sizes(self):
         ss = self.create("test_declares_maximum_share_sizes")
         ver = ss.remote_get_version()
-        sv1 = ver['http://allmydata.org/tahoe/protocols/storage/v1']
-        self.failUnlessIn('maximum-immutable-share-size', sv1)
-        self.failUnlessIn('maximum-mutable-share-size', sv1)
+        sv1 = ver[b'http://allmydata.org/tahoe/protocols/storage/v1']
+        self.failUnlessIn(b'maximum-immutable-share-size', sv1)
+        self.failUnlessIn(b'maximum-mutable-share-size', sv1)
 
     def test_declares_available_space(self):
         ss = self.create("test_declares_available_space")
         ver = ss.remote_get_version()
-        sv1 = ver['http://allmydata.org/tahoe/protocols/storage/v1']
-        self.failUnlessIn('available-space', sv1)
+        sv1 = ver[b'http://allmydata.org/tahoe/protocols/storage/v1']
+        self.failUnlessIn(b'available-space', sv1)
 
     def allocate(self, ss, storage_index, sharenums, size, canary=None):
@@ -981 +981 @@
         # feature.
         ver = ss.remote_get_version()
-        storage_v1_ver = ver["http://allmydata.org/tahoe/protocols/storage/v1"]
-        self.failUnless(storage_v1_ver.get("fills-holes-with-zero-bytes"))
+        storage_v1_ver = ver[b"http://allmydata.org/tahoe/protocols/storage/v1"]
+        self.failUnless(storage_v1_ver.get(b"fills-holes-with-zero-bytes"))
 
         # If the size is dropped to zero the share is deleted.