From 6fe68c792c3df395e4cd330e51bf578f14d51312 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Mon, 21 Sep 2020 13:03:29 -0400 Subject: [PATCH] Tests pass on Python 2 and 3. --- src/allmydata/immutable/upload.py | 2 +- src/allmydata/storage_client.py | 16 ++++++++-------- src/allmydata/test/test_upload.py | 26 +++++++++++++------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/allmydata/immutable/upload.py b/src/allmydata/immutable/upload.py index a6fc02f30..1ab312ab6 100644 --- a/src/allmydata/immutable/upload.py +++ b/src/allmydata/immutable/upload.py @@ -1818,7 +1818,7 @@ class Uploader(service.MultiService, log.PrefixingLogMixin): self.log("got helper connection, getting versions") default = { "http://allmydata.org/tahoe/protocols/helper/v1" : { }, - "application-version": "unknown: no get_version()", + "application-version": b"unknown: no get_version()", } d = add_version_to_remote_reference(helper, default) d.addCallback(self._got_versioned_helper) diff --git a/src/allmydata/storage_client.py b/src/allmydata/storage_client.py index 4e06e28fb..df1e4573e 100644 --- a/src/allmydata/storage_client.py +++ b/src/allmydata/storage_client.py @@ -625,14 +625,14 @@ class NativeStorageServer(service.MultiService): """ VERSION_DEFAULTS = { - "http://allmydata.org/tahoe/protocols/storage/v1" : - { "maximum-immutable-share-size": 2**32 - 1, - "maximum-mutable-share-size": 2*1000*1000*1000, # maximum prior to v1.9.2 - "tolerates-immutable-read-overrun": False, - "delete-mutable-shares-with-zero-length-writev": False, - "available-space": None, + b"http://allmydata.org/tahoe/protocols/storage/v1" : + { b"maximum-immutable-share-size": 2**32 - 1, + b"maximum-mutable-share-size": 2*1000*1000*1000, # maximum prior to v1.9.2 + b"tolerates-immutable-read-overrun": False, + b"delete-mutable-shares-with-zero-length-writev": False, + b"available-space": None, }, - "application-version": "unknown: no get_version()", + b"application-version": "unknown: no get_version()", } def __init__(self, server_id, ann, tub_maker, handler_overrides, node_config, config=StorageClientConfig()): @@ -773,7 +773,7 @@ class NativeStorageServer(service.MultiService): version = self.get_version() if version is None: return None - protocol_v1_version = version.get('http://allmydata.org/tahoe/protocols/storage/v1', {}) + protocol_v1_version = version.get(b'http://allmydata.org/tahoe/protocols/storage/v1', {}) available_space = protocol_v1_version.get('available-space') if available_space is None: available_space = protocol_v1_version.get('maximum-immutable-share-size', None) diff --git a/src/allmydata/test/test_upload.py b/src/allmydata/test/test_upload.py index 740c6815d..ca4825990 100644 --- a/src/allmydata/test/test_upload.py +++ b/src/allmydata/test/test_upload.py @@ -106,19 +106,19 @@ class FakeStorageServer(object): self._alloc_queries = 0 self._get_queries = 0 self.version = { - "http://allmydata.org/tahoe/protocols/storage/v1" : + b"http://allmydata.org/tahoe/protocols/storage/v1" : { - "maximum-immutable-share-size": 2**32 - 1, + b"maximum-immutable-share-size": 2**32 - 1, }, - "application-version": str(allmydata.__full_version__), + b"application-version": str(allmydata.__full_version__), } if mode == "small": self.version = { - "http://allmydata.org/tahoe/protocols/storage/v1" : + b"http://allmydata.org/tahoe/protocols/storage/v1" : { - "maximum-immutable-share-size": 10, + b"maximum-immutable-share-size": 10, }, - "application-version": str(allmydata.__full_version__), + b"application-version": str(allmydata.__full_version__), } @@ -306,9 +306,9 @@ class GoodServer(unittest.TestCase, ShouldFailMixin, SetDEPMixin): def _check_large(self, newuri, size): u = uri.from_string(newuri) self.failUnless(isinstance(u, uri.CHKFileURI)) - self.failUnless(isinstance(u.get_storage_index(), str)) + self.failUnless(isinstance(u.get_storage_index(), bytes)) self.failUnlessEqual(len(u.get_storage_index()), 16) - self.failUnless(isinstance(u.key, str)) + self.failUnless(isinstance(u.key, bytes)) self.failUnlessEqual(len(u.key), 16) self.failUnlessEqual(u.size, size) @@ -431,9 +431,9 @@ class ServerErrors(unittest.TestCase, ShouldFailMixin, SetDEPMixin): def _check_large(self, newuri, size): u = uri.from_string(newuri) self.failUnless(isinstance(u, uri.CHKFileURI)) - self.failUnless(isinstance(u.get_storage_index(), str)) + self.failUnless(isinstance(u.get_storage_index(), bytes)) self.failUnlessEqual(len(u.get_storage_index()), 16) - self.failUnless(isinstance(u.key, str)) + self.failUnless(isinstance(u.key, bytes)) self.failUnlessEqual(len(u.key), 16) self.failUnlessEqual(u.size, size) @@ -601,9 +601,9 @@ class ServerSelection(unittest.TestCase): def _check_large(self, newuri, size): u = uri.from_string(newuri) self.failUnless(isinstance(u, uri.CHKFileURI)) - self.failUnless(isinstance(u.get_storage_index(), str)) + self.failUnless(isinstance(u.get_storage_index(), bytes)) self.failUnlessEqual(len(u.get_storage_index()), 16) - self.failUnless(isinstance(u.key, str)) + self.failUnless(isinstance(u.key, bytes)) self.failUnlessEqual(len(u.key), 16) self.failUnlessEqual(u.size, size) @@ -1628,7 +1628,7 @@ class EncodingParameters(GridTestMixin, unittest.TestCase, SetDEPMixin, "test_upper_limit_on_readonly_queries", "sent 8 queries to 8 servers", client.upload, - upload.Data('data' * 10000, convergence=b""))) + upload.Data(b'data' * 10000, convergence=b""))) return d