diff --git a/src/allmydata/test/web/test_web.py b/src/allmydata/test/web/test_web.py index d787124eb..1d235af63 100644 --- a/src/allmydata/test/web/test_web.py +++ b/src/allmydata/test/web/test_web.py @@ -1058,41 +1058,47 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi self.failUnlessReallyEqual(int(status), 200) soup = BeautifulSoup(body, 'html5lib') + h = self.s.get_history() # Check for `Not started` + ret_num = h.list_all_retrieve_statuses()[0].get_counter() assert_soup_has_tag_with_attributes_and_content( self, soup, u"a", u"Not started", - {u"href": u"/status/retrieve-0"} + {u"href": u"/status/retrieve-{}".format(ret_num)} ) # Check for `Not started` + pub_num = h.list_all_publish_statuses()[0].get_counter() assert_soup_has_tag_with_attributes_and_content( self, soup, u"a", u"Not started", - {u"href": u"/status/publish-0"} + {u"href": u"/status/publish-{}".format(pub_num)} ) # Check for `Not started` + mu_num = h.list_all_mapupdate_statuses()[0].get_counter() assert_soup_has_tag_with_attributes_and_content( self, soup, u"a", u"Not started", - {u"href": u"/status/mapupdate-0"} + {u"href": u"/status/mapupdate-{}".format(mu_num)} ) # Check for `fetching segments # 2,3; errors on segment 1`: see build_one_ds() above. + dl_num = h.list_all_download_statuses()[0].get_counter() assert_soup_has_tag_with_attributes_and_content( self, soup, u"a", u"fetching segments 2,3; errors on segment 1", - {u"href": u"/status/down-0"} + {u"href": u"/status/down-{}".format(dl_num)} ) # Check for `Not started` + ul_num = h.list_all_upload_statuses()[0].get_counter() assert_soup_has_tag_with_attributes_and_content( self, soup, u"a", u"Not started", - {u"href": u"/status/up-0"} + {u"href": u"/status/up-{}".format(ul_num)} ) d = self.GET("/status", return_response=True)