Changeset 31ee2e1 in trunk

Timestamp:

2020-11-06T15:20:18Z (5 years ago)

Author:

Itamar Turner-Trauring <itamar@…>

Branches:

master

Children:

84a33625

Parents:

836d41a

Message:

Tests pass on Python 3.

Location:

src/allmydata

Files:

• mutable/checker.py (modified) (1 diff)
• test/mutable/test_checker.py (modified) (4 diffs)
• test/mutable/util.py (modified) (3 diffs)

src/allmydata/mutable/checker.py ¶

@@ -188 +188 @@
             report.append("Corrupt Shares:")
             summary.append("Corrupt Shares:")
-        for (server, shnum, f) in sorted(self.bad_shares):
+        for (server, shnum, f) in self.bad_shares:
             serverid = server.get_serverid()
             locator = (server, self._storage_index, shnum)

src/allmydata/test/mutable/test_checker.py ¶

@@ -42 +42 @@
     def test_check_not_enough_shares(self):
         for shares in self._storage._peers.values():
-            for shnum in shares.keys():
+            for shnum in list(shares.keys()):
                 if shnum > 0:
                     del shares[shnum]
@@ -53 +53 @@
         def _then(ignored):
             for shares in self._storage._peers.values():
-                for shnum in shares.keys():
+                for shnum in list(shares.keys()):
                     if shnum > 0:
                         del shares[shnum]
@@ -243 +243 @@
 
     def test_verify_sdmf_empty(self):
-        d = self.publish_sdmf("")
+        d = self.publish_sdmf(b"")
         d.addCallback(lambda ignored: self._fn.check(Monitor(), verify=True))
         d.addCallback(self.check_good, "test_verify_sdmf")
@@ -250 +250 @@
 
     def test_verify_mdmf_empty(self):
-        d = self.publish_mdmf("")
+        d = self.publish_mdmf(b"")
         d.addCallback(lambda ignored: self._fn.check(Monitor(), verify=True))
         d.addCallback(self.check_good, "test_verify_mdmf")

src/allmydata/test/mutable/util.py ¶

@@ +1 @@
+from future.utils import bchr
 from past.builtins import long
 
@@ -147 +148 @@
 def flip_bit(original, byte_offset):
     return (original[:byte_offset] +
-            chr(ord(original[byte_offset]) ^ 0x01) +
+            bchr(ord(original[byte_offset:byte_offset+1]) ^ 0x01) +
             original[byte_offset+1:])
 
@@ -154 +155 @@
     # because 1 is a valid version number. So we add two instead.
     return (original[:byte_offset] +
-            chr(ord(original[byte_offset]) ^ 0x02) +
+            bchr(ord(original[byte_offset:byte_offset+1]) ^ 0x02) +
             original[byte_offset+1:])