Changeset 0b6b4b6 in trunk

Timestamp:

2020-09-22T12:36:39Z (4 years ago)

Author:

Chad Whitacre <chad@…>

Branches:

master

Children:

de48dff

Parents:

58c99d0

Message:

Port test_immutable to Python 3

Files:

• newsfragments/3431.minor (added)
• src/allmydata/test/common.py (modified) (2 diffs)
• src/allmydata/test/common_util.py (modified) (4 diffs)
• src/allmydata/test/test_common_util.py (added)
• src/allmydata/test/test_immutable.py (modified) (6 diffs)
• src/allmydata/util/_python3.py (modified) (2 diffs)

src/allmydata/test/common.py ¶

@@ -782 +782 @@
 
 
-TEST_DATA="\x02"*(Uploader.URI_LIT_SIZE_THRESHOLD+1)
+TEST_DATA=b"\x02"*(Uploader.URI_LIT_SIZE_THRESHOLD+1)
 
 
@@ -959 +959 @@
     if sharevernum == 1:
         curval = struct.unpack(">L", data[0x0c+0x18:0x0c+0x18+4])[0]
-        newval = random.randrange(0, max(1, (curval/hashutil.CRYPTO_VAL_SIZE)/2))*hashutil.CRYPTO_VAL_SIZE
+        newval = random.randrange(0, max(1, (curval/hashutil.CRYPTO_VAL_SIZE)//2))*hashutil.CRYPTO_VAL_SIZE
         newvalstr = struct.pack(">L", newval)
         return data[:0x0c+0x18]+newvalstr+data[0x0c+0x18+4:]
     else:
         curval = struct.unpack(">Q", data[0x0c+0x2c:0x0c+0x2c+8])[0]
-        newval = random.randrange(0, max(1, (curval/hashutil.CRYPTO_VAL_SIZE)/2))*hashutil.CRYPTO_VAL_SIZE
+        newval = random.randrange(0, max(1, (curval/hashutil.CRYPTO_VAL_SIZE)//2))*hashutil.CRYPTO_VAL_SIZE
         newvalstr = struct.pack(">Q", newval)
         return data[:0x0c+0x2c]+newvalstr+data[0x0c+0x2c+8:]

src/allmydata/test/common_util.py ¶

@@ +1 @@
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
+from __future__ import unicode_literals
+
+from future.utils import PY2, bord, bchr, binary_type
+if PY2:
+    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min  # noqa: F401
+
+    # XXX this is a hack that makes some tests pass on Python3, remove in the future
+    from ..scripts import runner
 
 import os
@@ -10 +20 @@
 from ..util.assertutil import precondition
 from allmydata.util.encodingutil import get_io_encoding
-from future.utils import PY2
-if PY2: # XXX this is a hack that makes some tests pass on Python3, remove
-        # in the future
-    from ..scripts import runner
 # Imported for backwards compatibility:
 from .common_py3 import (
@@ -58 +64 @@
 
 def insecurerandstr(n):
-    return ''.join(map(chr, map(randrange, [0]*n, [256]*n)))
+    return b''.join(map(bchr, map(randrange, [0]*n, [256]*n)))
 
 def flip_bit(good, which):
+    # TODO Probs need to update with bchr/bord as with flip_one_bit, below.
     # flip the low-order bit of good[which]
     if which == -1:
@@ -71 +78 @@
     """ flip one random bit of the string s, in a byte greater than or equal to offset and less
     than offset+size. """
+    assert isinstance(s, binary_type)
     if size is None:
         size=len(s)-offset
     i = randrange(offset, offset+size)
-    result = s[:i] + chr(ord(s[i])^(0x01<<randrange(0, 8))) + s[i+1:]
+    result = s[:i] + bchr(bord(s[i])^(0x01<<randrange(0, 8))) + s[i+1:]
     assert result != s, "Internal error -- flip_one_bit() produced the same string as its input: %s == %s" % (result, s)
     return result

src/allmydata/test/test_immutable.py ¶

@@ +1 @@
+"""
+This module has been ported to Python 3.
+"""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from future.utils import PY2
+if PY2:
+    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min  # noqa: F401
 
 import random
@@ -80 +91 @@
         # another share", then you lose.
 
-        rcap = uri.CHKFileURI('a'*32, 'a'*32, 3, 99, 100)
+        rcap = uri.CHKFileURI(b'a'*32, b'a'*32, 3, 99, 100)
         vcap = rcap.get_verify_cap()
 
@@ -89 +100 @@
             def __init__(self, buckets):
                 self.version = {
-                    'http://allmydata.org/tahoe/protocols/storage/v1': {
-                        "tolerates-immutable-read-overrun": True
+                    b'http://allmydata.org/tahoe/protocols/storage/v1': {
+                        b"tolerates-immutable-read-overrun": True
                         }
                     }
@@ -127 +138 @@
         mockserver2 = MockServer({})
         mockserver3 = MockServer({3: MockBuckets()})
-        servers = [ NoNetworkServer("ms1", mockserver1),
-                    NoNetworkServer("ms2", mockserver2),
-                    NoNetworkServer("ms3", mockserver3), ]
+        servers = [ NoNetworkServer(b"ms1", mockserver1),
+                    NoNetworkServer(b"ms2", mockserver2),
+                    NoNetworkServer(b"ms3", mockserver3), ]
         mockstoragebroker = MockStorageBroker(servers)
         mockdownloadstatus = MockDownloadStatus()
@@ -156 +167 @@
         # set their own value for happy -- the default (7) breaks stuff.
         c1.encoding_params['happy'] = 1
-        d = c1.upload(Data(TEST_DATA, convergence=""))
+        d = c1.upload(Data(TEST_DATA, convergence=b""))
         def _after_upload(ur):
             self.uri = ur.get_uri()
@@ -177 +188 @@
 
     def _shuffled(self, num_shnums):
-        shnums = range(10)
+        shnums = list(range(10))
         random.shuffle(shnums)
         return shnums[:num_shnums]

src/allmydata/util/_python3.py ¶

@@ -80 +80 @@
     "allmydata.test.test_base62",
     "allmydata.test.test_codec",
+    "allmydata.test.test_common_util",
     "allmydata.test.test_configutil",
     "allmydata.test.test_connection_status",
@@ -92 +93 @@
     "allmydata.test.test_hashutil",
     "allmydata.test.test_humanreadable",
+    "allmydata.test.test_immutable",
     "allmydata.test.test_iputil",
     "allmydata.test.test_log",