ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-31 08:25:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Port to Python 3.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2020-12-22 13:19:59 -05:00
parent 3ca17454c4
commit 1c7956bc1a
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/allmydata/test/web/test_grid.py
View File

@ -1,6 +1,14 @@
"""
Ported to Python 3.
"""
from __future__ import print_function from __future__ import print_function
from __future__ import absolute_import
from __future__ import division
from __future__ import unicode_literals
from past.builtins import unicode 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 os.path, re import os.path, re
from urllib.parse import quote as url_quote from urllib.parse import quote as url_quote
@ -50,12 +58,12 @@ class Grid(GridTestMixin, WebErrorMixin, ShouldFailMixin, testutil.ReallyEqualMi
def CHECK(self, ign, which, args, clientnum=0): def CHECK(self, ign, which, args, clientnum=0):
fileurl = self.fileurls[which] fileurl = self.fileurls[which]
url = fileurl + "?" + args url = fileurl + "?" + args
return self.GET(url, method="POST", clientnum=clientnum).addCallback(unicode, "utf-8") return self.GET(url, method="POST", clientnum=clientnum).addCallback(str, "utf-8")
def GET_string(self, *args, **kwargs): def GET_string(self, *args, **kwargs):
"""Send an HTTP request, but convert result to Unicode string.""" """Send an HTTP request, but convert result to Unicode string."""
d = GridTestMixin.GET(self, *args, **kwargs) d = GridTestMixin.GET(self, *args, **kwargs)
d.addCallback(unicode, "utf-8") d.addCallback(str, "utf-8")
return d return d
def test_filecheck(self): def test_filecheck(self):
@ -402,7 +410,7 @@ class Grid(GridTestMixin, WebErrorMixin, ShouldFailMixin, testutil.ReallyEqualMi
self.failUnlessIn(unknown_rocap, res) self.failUnlessIn(unknown_rocap, res)
else: else:
self.failIfIn(unknown_rocap, res) self.failIfIn(unknown_rocap, res)
res = unicode(res, "utf-8") res = str(res, "utf-8")
self.failUnlessIn("Object Type: <span>unknown</span>", res) self.failUnlessIn("Object Type: <span>unknown</span>", res)
self.failIfIn("Raw data as", res) self.failIfIn("Raw data as", res)
self.failIfIn("Directory writecap", res) self.failIfIn("Directory writecap", res)
@ -712,7 +720,7 @@ class Grid(GridTestMixin, WebErrorMixin, ShouldFailMixin, testutil.ReallyEqualMi
d.addCallback(lambda ign: d.addCallback(lambda ign:
self.delete_shares_numbered(self.uris["subdir"], self.delete_shares_numbered(self.uris["subdir"],
range(1, 10))) list(range(1, 10))))
# root # root
# root/good # root/good
@ -1072,7 +1080,7 @@ class Grid(GridTestMixin, WebErrorMixin, ShouldFailMixin, testutil.ReallyEqualMi
d.addCallback(lambda ign: c0.upload(upload.Data(DATA, convergence=b""))) d.addCallback(lambda ign: c0.upload(upload.Data(DATA, convergence=b"")))
def _stash_bad(ur): def _stash_bad(ur):
self.fileurls["1share"] = "uri/" + url_quote(ur.get_uri()) self.fileurls["1share"] = "uri/" + url_quote(ur.get_uri())
self.delete_shares_numbered(ur.get_uri(), range(1,10)) self.delete_shares_numbered(ur.get_uri(), list(range(1,10)))
u = uri.from_string(ur.get_uri()) u = uri.from_string(ur.get_uri())
u.key = testutil.flip_bit(u.key, 0) u.key = testutil.flip_bit(u.key, 0)
@ -1084,14 +1092,14 @@ class Grid(GridTestMixin, WebErrorMixin, ShouldFailMixin, testutil.ReallyEqualMi
u = n.get_uri() u = n.get_uri()
url = self.fileurls["dir-1share"] = "uri/" + url_quote(u) url = self.fileurls["dir-1share"] = "uri/" + url_quote(u)
self.fileurls["dir-1share-json"] = url + "?t=json" self.fileurls["dir-1share-json"] = url + "?t=json"
self.delete_shares_numbered(u, range(1,10)) self.delete_shares_numbered(u, list(range(1,10)))
d.addCallback(_mangle_dirnode_1share) d.addCallback(_mangle_dirnode_1share)
d.addCallback(lambda ign: c0.create_dirnode()) d.addCallback(lambda ign: c0.create_dirnode())
def _mangle_dirnode_0share(n): def _mangle_dirnode_0share(n):
u = n.get_uri() u = n.get_uri()
url = self.fileurls["dir-0share"] = "uri/" + url_quote(u) url = self.fileurls["dir-0share"] = "uri/" + url_quote(u)
self.fileurls["dir-0share-json"] = url + "?t=json" self.fileurls["dir-0share-json"] = url + "?t=json"
self.delete_shares_numbered(u, range(0,10)) self.delete_shares_numbered(u, list(range(0,10)))
d.addCallback(_mangle_dirnode_0share) d.addCallback(_mangle_dirnode_0share)
# NotEnoughSharesError should be reported sensibly, with a # NotEnoughSharesError should be reported sensibly, with a
@ -1103,7 +1111,7 @@ class Grid(GridTestMixin, WebErrorMixin, ShouldFailMixin, testutil.ReallyEqualMi
410, "Gone", "NoSharesError", 410, "Gone", "NoSharesError",
self.GET, self.fileurls["0shares"])) self.GET, self.fileurls["0shares"]))
def _check_zero_shares(body): def _check_zero_shares(body):
body = unicode(body, "utf-8") body = str(body, "utf-8")
self.failIfIn("<html>", body) self.failIfIn("<html>", body)
body = " ".join(body.strip().split()) body = " ".join(body.strip().split())
exp = ("NoSharesError: no shares could be found. " exp = ("NoSharesError: no shares could be found. "
@ -1121,7 +1129,7 @@ class Grid(GridTestMixin, WebErrorMixin, ShouldFailMixin, testutil.ReallyEqualMi
410, "Gone", "NotEnoughSharesError", 410, "Gone", "NotEnoughSharesError",
self.GET, self.fileurls["1share"])) self.GET, self.fileurls["1share"]))
def _check_one_share(body): def _check_one_share(body):
body = unicode(body, "utf-8") body = str(body, "utf-8")
self.failIfIn("<html>", body) self.failIfIn("<html>", body)
body = " ".join(body.strip().split()) body = " ".join(body.strip().split())
msgbase = ("NotEnoughSharesError: This indicates that some " msgbase = ("NotEnoughSharesError: This indicates that some "
@ -1146,7 +1154,7 @@ class Grid(GridTestMixin, WebErrorMixin, ShouldFailMixin, testutil.ReallyEqualMi
404, "Not Found", None, 404, "Not Found", None,
self.GET, self.fileurls["imaginary"])) self.GET, self.fileurls["imaginary"]))
def _missing_child(body): def _missing_child(body):
body = unicode(body, "utf-8") body = str(body, "utf-8")
self.failUnlessIn("No such child: imaginary", body) self.failUnlessIn("No such child: imaginary", body)
d.addCallback(_missing_child) d.addCallback(_missing_child)
@ -1196,7 +1204,7 @@ class Grid(GridTestMixin, WebErrorMixin, ShouldFailMixin, testutil.ReallyEqualMi
self.GET, self.GET,
self.fileurls["dir-0share-json"])) self.fileurls["dir-0share-json"]))
def _check_unrecoverable_file(body): def _check_unrecoverable_file(body):
body = unicode(body, "utf-8") body = str(body, "utf-8")
self.failIfIn("<html>", body) self.failIfIn("<html>", body)
body = " ".join(body.strip().split()) body = " ".join(body.strip().split())
exp = ("UnrecoverableFileError: the directory (or mutable file) " exp = ("UnrecoverableFileError: the directory (or mutable file) "
@ -1237,7 +1245,7 @@ class Grid(GridTestMixin, WebErrorMixin, ShouldFailMixin, testutil.ReallyEqualMi
self.GET, "ERRORBOOM", self.GET, "ERRORBOOM",
headers={"accept": "*/*"})) headers={"accept": "*/*"}))
def _internal_error_html1(body): def _internal_error_html1(body):
body = unicode(body, "utf-8") body = str(body, "utf-8")
self.failUnlessIn("<html>", "expected HTML, not '%s'" % body) self.failUnlessIn("<html>", "expected HTML, not '%s'" % body)
d.addCallback(_internal_error_html1) d.addCallback(_internal_error_html1)
@ -1247,7 +1255,7 @@ class Grid(GridTestMixin, WebErrorMixin, ShouldFailMixin, testutil.ReallyEqualMi
self.GET, "ERRORBOOM", self.GET, "ERRORBOOM",
headers={"accept": "text/plain"})) headers={"accept": "text/plain"}))
def _internal_error_text2(body): def _internal_error_text2(body):
body = unicode(body, "utf-8") body = str(body, "utf-8")
self.failIfIn("<html>", body) self.failIfIn("<html>", body)
self.failUnless(body.startswith("Traceback "), body) self.failUnless(body.startswith("Traceback "), body)
d.addCallback(_internal_error_text2) d.addCallback(_internal_error_text2)
@ -1259,7 +1267,7 @@ class Grid(GridTestMixin, WebErrorMixin, ShouldFailMixin, testutil.ReallyEqualMi
self.GET, "ERRORBOOM", self.GET, "ERRORBOOM",
headers={"accept": CLI_accepts})) headers={"accept": CLI_accepts}))
def _internal_error_text3(body): def _internal_error_text3(body):
body = unicode(body, "utf-8") body = str(body, "utf-8")
self.failIfIn("<html>", body) self.failIfIn("<html>", body)
self.failUnless(body.startswith("Traceback "), body) self.failUnless(body.startswith("Traceback "), body)
d.addCallback(_internal_error_text3) d.addCallback(_internal_error_text3)
@ -1316,7 +1324,7 @@ class Grid(GridTestMixin, WebErrorMixin, ShouldFailMixin, testutil.ReallyEqualMi
f.write(" # this is a comment\n") f.write(" # this is a comment\n")
f.write(" \n") f.write(" \n")
f.write("\n") # also exercise blank lines f.write("\n") # also exercise blank lines
f.write("%s off-limits to you\n" % (unicode(base32.b2a(self.si), "ascii"),)) f.write("%s off-limits to you\n" % (str(base32.b2a(self.si), "ascii"),))
f.close() f.close()
# clients should be checking the blacklist each time, so we don't # clients should be checking the blacklist each time, so we don't
# need to restart the client # need to restart the client
@ -1380,7 +1388,7 @@ class Grid(GridTestMixin, WebErrorMixin, ShouldFailMixin, testutil.ReallyEqualMi
self.child_url = b"uri/"+dn.get_readonly_uri()+b"/child" self.child_url = b"uri/"+dn.get_readonly_uri()+b"/child"
d.addCallback(_get_dircap) d.addCallback(_get_dircap)
d.addCallback(lambda ign: self.GET(self.dir_url_base, followRedirect=True)) d.addCallback(lambda ign: self.GET(self.dir_url_base, followRedirect=True))
d.addCallback(lambda body: self.failUnlessIn(DIR_HTML_TAG, unicode(body, "utf-8"))) d.addCallback(lambda body: self.failUnlessIn(DIR_HTML_TAG, str(body, "utf-8")))
d.addCallback(lambda ign: self.GET(self.dir_url_json1)) d.addCallback(lambda ign: self.GET(self.dir_url_json1))
d.addCallback(lambda res: json.loads(res)) # just check it decodes d.addCallback(lambda res: json.loads(res)) # just check it decodes
d.addCallback(lambda ign: self.GET(self.dir_url_json2)) d.addCallback(lambda ign: self.GET(self.dir_url_json2))

1
src/allmydata/util/_python3.py
View File

@ -180,6 +180,7 @@ PORTED_TEST_MODULES = [
"allmydata.test.test_uri", "allmydata.test.test_uri",
"allmydata.test.test_util", "allmydata.test.test_util",
"allmydata.test.web.test_common", "allmydata.test.web.test_common",
"allmydata.test.web.test_grid",
"allmydata.test.web.test_util", "allmydata.test.web.test_util",
"allmydata.test.web.test_status", "allmydata.test.web.test_status",
] ]