diff --git a/src/allmydata/test/web/test_grid.py b/src/allmydata/test/web/test_grid.py
index 2b953b82c..73c354567 100644
--- a/src/allmydata/test/web/test_grid.py
+++ b/src/allmydata/test/web/test_grid.py
@@ -21,7 +21,12 @@ from allmydata.mutable import publish
from .. import common_util as testutil
from ..common import WebErrorMixin, ShouldFailMixin
from ..no_network import GridTestMixin
-from .common import unknown_rwcap, unknown_rocap, unknown_immcap, FAVICON_MARKUP
+from .common import (
+ assert_soup_has_favicon,
+ unknown_immcap,
+ unknown_rocap,
+ unknown_rwcap,
+)
DIR_HTML_TAG = ''
@@ -92,7 +97,9 @@ class Grid(GridTestMixin, WebErrorMixin, ShouldFailMixin, testutil.ReallyEqualMi
def _got_html_good(res):
self.failUnlessIn("Healthy", res)
self.failIfIn("Not Healthy", res)
- self.failUnlessIn(FAVICON_MARKUP, res)
+ soup = BeautifulSoup(res, 'html5lib')
+ assert_soup_has_favicon(self, soup)
+
d.addCallback(_got_html_good)
d.addCallback(self.CHECK, "good", "t=check&return_to=somewhere")
def _got_html_good_return_to(res):
@@ -235,7 +242,9 @@ class Grid(GridTestMixin, WebErrorMixin, ShouldFailMixin, testutil.ReallyEqualMi
self.failUnlessIn("Healthy", res)
self.failIfIn("Not Healthy", res)
self.failUnlessIn("No repair necessary", res)
- self.failUnlessIn(FAVICON_MARKUP, res)
+ soup = BeautifulSoup(res, 'html5lib')
+ assert_soup_has_favicon(self, soup)
+
d.addCallback(_got_html_good)
d.addCallback(self.CHECK, "sick", "t=check&repair=true")
diff --git a/src/allmydata/test/web/test_web.py b/src/allmydata/test/web/test_web.py
index 5be0b2f7b..94e628ef9 100644
--- a/src/allmydata/test/web/test_web.py
+++ b/src/allmydata/test/web/test_web.py
@@ -3080,13 +3080,15 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
res = yield self.get_operation_results(None, "123", "html")
self.failUnlessIn("Objects Checked: 11", res)
self.failUnlessIn("Objects Healthy: 11", res)
- self.failUnlessIn(FAVICON_MARKUP, res)
+ soup = BeautifulSoup(res, 'html5lib')
+ assert_soup_has_favicon(self, soup)
res = yield self.GET("/operations/123/")
# should be the same as without the slash
self.failUnlessIn("Objects Checked: 11", res)
self.failUnlessIn("Objects Healthy: 11", res)
- self.failUnlessIn(FAVICON_MARKUP, res)
+ soup = BeautifulSoup(res, 'html5lib')
+ assert_soup_has_favicon(self, soup)
yield self.shouldFail2(error.Error, "one", "404 Not Found",
"No detailed results for SI bogus",
@@ -3136,7 +3138,8 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
self.failUnlessIn("Objects Unhealthy (after repair): 0", res)
self.failUnlessIn("Corrupt Shares (after repair): 0", res)
- self.failUnlessIn(FAVICON_MARKUP, res)
+ soup = BeautifulSoup(res, 'html5lib')
+ assert_soup_has_favicon(self, soup)
d.addCallback(_check_html)
return d