ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-02 03:06:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More passing tests on Python 3.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2021-01-22 11:37:37 -05:00
parent 011b027c39
commit 27a5211385
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -649,7 +649,7 @@ class WebMixin(TimezoneMixin):
def should404(self, res, which): def should404(self, res, which):
if isinstance(res, failure.Failure): if isinstance(res, failure.Failure):
res.trap(error.Error) res.trap(error.Error)
self.failUnlessReallyEqual(res.value.status, "404") self.failUnlessReallyEqual(res.value.status, b"404")
else: else:
self.fail("%s was supposed to Error(404), not get '%s'" % self.fail("%s was supposed to Error(404), not get '%s'" %
(which, res)) (which, res))
@ -657,7 +657,7 @@ class WebMixin(TimezoneMixin):
def should302(self, res, which): def should302(self, res, which):
if isinstance(res, failure.Failure): if isinstance(res, failure.Failure):
res.trap(error.Error) res.trap(error.Error)
self.failUnlessReallyEqual(res.value.status, "302") self.failUnlessReallyEqual(res.value.status, b"302")
else: else:
self.fail("%s was supposed to Error(302), not get '%s'" % self.fail("%s was supposed to Error(302), not get '%s'" %
(which, res)) (which, res))
@ -1933,7 +1933,7 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
def test_CSS_FILE(self): def test_CSS_FILE(self):
d = self.GET("/tahoe.css", followRedirect=True) d = self.GET("/tahoe.css", followRedirect=True)
def _check(res): def _check(res):
CSS_STYLE=re.compile('toolbar\s{.+text-align:\scenter.+toolbar-item.+display:\sinline',re.DOTALL) CSS_STYLE=re.compile(b'toolbar\s{.+text-align:\scenter.+toolbar-item.+display:\sinline',re.DOTALL)
self.failUnless(CSS_STYLE.search(res), res) self.failUnless(CSS_STYLE.search(res), res)
d.addCallback(_check) d.addCallback(_check)
return d return d
@ -1976,7 +1976,7 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
self._check_upload_and_mkdir_forms(soup) self._check_upload_and_mkdir_forms(soup)
toolbars = soup.find_all(u"li", {u"class": u"toolbar-item"}) toolbars = soup.find_all(u"li", {u"class": u"toolbar-item"})
self.assertTrue(any(li.text == u"Return to Welcome page" for li in toolbars)) self.assertTrue(any(li.text == u"Return to Welcome page" for li in toolbars))
self.failUnlessIn("quux", data) self.failUnlessIn(b"quux", data)
@inlineCallbacks @inlineCallbacks
def test_GET_DIRECTORY_html_filenode_encoding(self): def test_GET_DIRECTORY_html_filenode_encoding(self):
@ -4774,7 +4774,7 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
response = yield req("POST", "/uri?format=sdmf&t=mkdir") response = yield req("POST", "/uri?format=sdmf&t=mkdir")
dircap = yield response.content() dircap = yield response.content()
assert dircap.startswith('URI:DIR2:') assert dircap.startswith(b'URI:DIR2:')
dircap_uri = "/uri/?uri={}&t=json".format(urlquote(dircap)) dircap_uri = "/uri/?uri={}&t=json".format(urlquote(dircap))
response = yield req( response = yield req(