From 8db60e3486d78e1b628faaf8b408942251471d4a Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Thu, 16 Jul 2020 17:16:18 -0400 Subject: [PATCH] Do the simple thing when testing status subpaths --- src/allmydata/test/web/test_web.py | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/allmydata/test/web/test_web.py b/src/allmydata/test/web/test_web.py index 45bc7034f..c8f954d01 100644 --- a/src/allmydata/test/web/test_web.py +++ b/src/allmydata/test/web/test_web.py @@ -1084,45 +1084,35 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi def test_status_up_subpath(self): # See that "GET /status/up-0" works. - h = self.s.get_history() - ul_num = h.list_all_upload_statuses()[0].get_counter() - d = self.GET("/status/up-{}".format(ul_num), return_response=True) + d = self.GET("/status/up-0", return_response=True) d.addCallback(self._check_status_subpath_result, u"Tahoe-LAFS - File Upload Status") return d def test_status_down_subpath(self): # See that "GET /status/down-0" works. - h = self.s.get_history() - dl_num = h.list_all_download_statuses()[0].get_counter() - d = self.GET("/status/down-{}".format(dl_num), return_response=True) + d = self.GET("/status/down-0", return_response=True) d.addCallback(self._check_status_subpath_result, u"Tahoe-LAFS - File Download Status") return d def test_status_mapupdate_subpath(self): # See that "GET /status/mapupdate-0" works. - h = self.s.get_history() - mu_num = h.list_all_mapupdate_statuses()[0].get_counter() - d = self.GET("/status/mapupdate-{}".format(mu_num), return_response=True) + d = self.GET("/status/mapupdate-0", return_response=True) d.addCallback(self._check_status_subpath_result, u"Tahoe-LAFS - Mutable File Servermap Update Status") return d def test_status_publish_subpath(self): # See that "GET /status/publish-0" works. - h = self.s.get_history() - pub_num = h.list_all_publish_statuses()[0].get_counter() - d = self.GET("/status/publish-{}".format(pub_num), return_response=True) + d = self.GET("/status/publish-0", return_response=True) d.addCallback(self._check_status_subpath_result, u"Tahoe-LAFS - Mutable File Publish Status") return d def test_status_retrieve_subpath(self): # See that "GET /status/retrieve-0" works. - h = self.s.get_history() - ret_num = h.list_all_retrieve_statuses()[0].get_counter() - d = self.GET("/status/retrieve-{}".format(ret_num), return_response=True) + d = self.GET("/status/retrieve-0", return_response=True) d.addCallback(self._check_status_subpath_result, u"Tahoe-LAFS - Mutable File Retrieve Status") return d