ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-22 04:18:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Another passing Python 3 test.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2021-01-26 12:40:07 -05:00
parent 5a2339ced3
commit 9f5e1381bf
5 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/allmydata/test/common.py
View File

@ -432,7 +432,7 @@ class FakeCHKFileNode(object): # type: ignore # incomplete implementation
return self.storage_index return self.storage_index
def check(self, monitor, verify=False, add_lease=False): def check(self, monitor, verify=False, add_lease=False):
s = StubServer("\x00"*20) s = StubServer(b"\x00"*20)
r = CheckResults(self.my_uri, self.storage_index, r = CheckResults(self.my_uri, self.storage_index,
healthy=True, recoverable=True, healthy=True, recoverable=True,
count_happiness=10, count_happiness=10,

20
src/allmydata/test/web/test_web.py
View File

@ -3178,7 +3178,7 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
def test_POST_DIRURL_check_and_repair(self): def test_POST_DIRURL_check_and_repair(self):
foo_url = self.public_url + "/foo" foo_url = self.public_url + "/foo"
res = yield self.POST(foo_url, t="check", repair="true") res = yield self.POST(foo_url, t="check", repair="true")
self.failUnlessIn("Healthy :", res) self.failUnlessIn(b"Healthy :", res)
redir_url = "http://allmydata.org/TARGET" redir_url = "http://allmydata.org/TARGET"
body, headers = self.build_form(t="check", repair="true", body, headers = self.build_form(t="check", repair="true",
@ -3187,6 +3187,7 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
method="post", data=body, headers=headers, method="post", data=body, headers=headers,
code=http.FOUND) code=http.FOUND)
res = yield self.POST(foo_url, t="check", return_to=redir_url) res = yield self.POST(foo_url, t="check", return_to=redir_url)
res = unicode(res, "utf-8")
self.failUnlessIn("Healthy :", res) self.failUnlessIn("Healthy :", res)
self.failUnlessIn("Return to file/directory", res) self.failUnlessIn("Return to file/directory", res)
self.failUnlessIn(redir_url, res) self.failUnlessIn(redir_url, res)
@ -3195,9 +3196,9 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
quux_url = "/uri/%s" % urlquote(self._quux_txt_uri) quux_url = "/uri/%s" % urlquote(self._quux_txt_uri)
d = self.POST(quux_url, t="check") d = self.POST(quux_url, t="check")
def _check(res): def _check(res):
self.failUnlessIn("Healthy", res) self.failUnlessIn(b"Healthy", res)
d.addCallback(_check) d.addCallback(_check)
quux_extension_url = "/uri/%s" % urlquote("%s:3:131073" % self._quux_txt_uri) quux_extension_url = "/uri/%s" % urlquote("%s:3:131073" % unicode(self._quux_txt_uri, "utf-8"))
d.addCallback(lambda ignored: d.addCallback(lambda ignored:
self.POST(quux_extension_url, t="check")) self.POST(quux_extension_url, t="check"))
d.addCallback(_check) d.addCallback(_check)
@ -3264,15 +3265,15 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
self.failUnlessReallyEqual(data["count-objects-healthy"], 11) self.failUnlessReallyEqual(data["count-objects-healthy"], 11)
res = yield self.get_operation_results(None, "123", "html") res = yield self.get_operation_results(None, "123", "html")
self.failUnlessIn("Objects Checked: <span>11</span>", res) self.failUnlessIn(b"Objects Checked: <span>11</span>", res)
self.failUnlessIn("Objects Healthy: <span>11</span>", res) self.failUnlessIn(b"Objects Healthy: <span>11</span>", res)
soup = BeautifulSoup(res, 'html5lib') soup = BeautifulSoup(res, 'html5lib')
assert_soup_has_favicon(self, soup) assert_soup_has_favicon(self, soup)
res = yield self.GET("/operations/123/") res = yield self.GET("/operations/123/")
# should be the same as without the slash # should be the same as without the slash
self.failUnlessIn("Objects Checked: <span>11</span>", res) self.failUnlessIn(b"Objects Checked: <span>11</span>", res)
self.failUnlessIn("Objects Healthy: <span>11</span>", res) self.failUnlessIn(b"Objects Healthy: <span>11</span>", res)
soup = BeautifulSoup(res, 'html5lib') soup = BeautifulSoup(res, 'html5lib')
assert_soup_has_favicon(self, soup) assert_soup_has_favicon(self, soup)
@ -3282,9 +3283,9 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
foo_si = self._foo_node.get_storage_index() foo_si = self._foo_node.get_storage_index()
foo_si_s = base32.b2a(foo_si) foo_si_s = base32.b2a(foo_si)
res = yield self.GET("/operations/123/%s?output=JSON" % foo_si_s) res = yield self.GET("/operations/123/%s?output=JSON" % unicode(foo_si_s, "ascii"))
data = json.loads(res) data = json.loads(res)
self.failUnlessEqual(data["storage-index"], foo_si_s) self.failUnlessEqual(data["storage-index"], unicode(foo_si_s, "ascii"))
self.failUnless(data["results"]["healthy"]) self.failUnless(data["results"]["healthy"])
def test_POST_DIRURL_deepcheck_and_repair(self): def test_POST_DIRURL_deepcheck_and_repair(self):
@ -4261,6 +4262,7 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
http.FOUND, http.FOUND,
http.TEMPORARY_REDIRECT, http.TEMPORARY_REDIRECT,
] if code is None else [code] ] if code is None else [code]
body = yield response.content()
self.assertIn(response.code, codes) self.assertIn(response.code, codes)
location = response.headers.getRawHeaders(b"location")[0] location = response.headers.getRawHeaders(b"location")[0]
if target_location is not None: if target_location is not None:

2
src/allmydata/web/check_results.py
View File

@ -432,7 +432,7 @@ class DeepCheckResultsRenderer(MultiFormatResource):
return CheckResultsRenderer(self._client, return CheckResultsRenderer(self._client,
r.get_results_for_storage_index(si)) r.get_results_for_storage_index(si))
except KeyError: except KeyError:
raise WebError("No detailed results for SI %s" % html.escape(name), raise WebError("No detailed results for SI %s" % html.escape(str(name, "utf-8")),
http.NOT_FOUND) http.NOT_FOUND)
@render_exception @render_exception

5
src/allmydata/web/operations.py
View File

@ -1,3 +1,4 @@
from past.builtins import unicode
import time import time
from hyperlink import ( from hyperlink import (
@ -106,7 +107,7 @@ class OphandleTable(resource.Resource, service.Service):
(monitor, renderer, when_added) = self.handles[ophandle] (monitor, renderer, when_added) = self.handles[ophandle]
t = get_arg(req, "t", "status") t = get_arg(req, "t", "status")
if t == "cancel" and req.method == b"POST": if t == b"cancel" and req.method == b"POST":
monitor.cancel() monitor.cancel()
# return the status anyways, but release the handle # return the status anyways, but release the handle
self._release_ophandle(ophandle) self._release_ophandle(ophandle)
@ -151,7 +152,7 @@ class ReloadMixin(object):
@renderer @renderer
def refresh(self, req, tag): def refresh(self, req, tag):
if self.monitor.is_finished(): if self.monitor.is_finished():
return "" return b""
tag.attributes["http-equiv"] = "refresh" tag.attributes["http-equiv"] = "refresh"
tag.attributes["content"] = str(self.REFRESH_TIME) tag.attributes["content"] = str(self.REFRESH_TIME)
return tag return tag

4
src/allmydata/webish.py
View File

@ -211,7 +211,7 @@ class WebishServer(service.MultiService):
# use to test ophandle expiration. # use to test ophandle expiration.
self._operations = OphandleTable(clock) self._operations = OphandleTable(clock)
self._operations.setServiceParent(self) self._operations.setServiceParent(self)
self.root.putChild("operations", self._operations) self.root.putChild(b"operations", self._operations)
self.root.putChild(b"storage-plugins", StoragePlugins(client)) self.root.putChild(b"storage-plugins", StoragePlugins(client))
@ -220,7 +220,7 @@ class WebishServer(service.MultiService):
self.site = TahoeLAFSSite(tempdir, self.root) self.site = TahoeLAFSSite(tempdir, self.root)
self.staticdir = staticdir # so tests can check self.staticdir = staticdir # so tests can check
if staticdir: if staticdir:
self.root.putChild("static", static.File(staticdir)) self.root.putChild(b"static", static.File(staticdir))
if re.search(r'^\d', webport): if re.search(r'^\d', webport):
webport = "tcp:"+webport # twisted warns about bare "0" or "3456" webport = "tcp:"+webport # twisted warns about bare "0" or "3456"
# strports must be native strings. # strports must be native strings.