From abcd6e0e96298a765c751110b901ba85745ec8c2 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Wed, 4 Aug 2010 00:28:00 -0700 Subject: [PATCH] test_hung_server: update comments, remove dead "stage_4_d" code --- src/allmydata/test/test_hung_server.py | 37 +++++++++++++------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/src/allmydata/test/test_hung_server.py b/src/allmydata/test/test_hung_server.py index 4ef4d20d..24dc8467 100644 --- a/src/allmydata/test/test_hung_server.py +++ b/src/allmydata/test/test_hung_server.py @@ -122,12 +122,9 @@ class HungServerDownloadTest(GridTestMixin, ShouldFailMixin, PollMixin, n = self.c0.create_node_from_uri(self.uri) if self.mutable: d = n.download_best_version() - stage_4_d = None # currently we aren't doing any tests which require this for mutable files else: d = download_to_data(n) - #stage_4_d = n._downloader._all_downloads.keys()[0]._stage_4_d # too ugly! FIXME - stage_4_d = None - return (d, stage_4_d,) + return d def _wait_for_data(self, n): if self.mutable: @@ -143,7 +140,7 @@ class HungServerDownloadTest(GridTestMixin, ShouldFailMixin, PollMixin, self.failUnlessEqual(resultingdata, immutable_plaintext) def _download_and_check(self): - d, stage4d = self._start_download() + d = self._start_download() d.addCallback(self._check) return d @@ -215,8 +212,6 @@ class HungServerDownloadTest(GridTestMixin, ShouldFailMixin, PollMixin, d.addCallback(lambda ign: self._should_fail_download()) return d - # The tests below do not currently pass for mutable files. - def test_3_good_7_hung_immutable(self): d = defer.succeed(None) d.addCallback(lambda ign: self._set_up(False, "test_3_good_7_hung")) @@ -281,37 +276,41 @@ class HungServerDownloadTest(GridTestMixin, ShouldFailMixin, PollMixin, d.addCallback(_check_done) return d - def test_3_good_7_hung_mutable(self): - raise unittest.SkipTest("still broken") + def test_2_good_8_hung_then_1_recovers_immutable(self): d = defer.succeed(None) - d.addCallback(lambda ign: self._set_up(True, "test_3_good_7_hung")) + d.addCallback(lambda ign: self._set_up(False, "test_2_good_8_hung_then_1_recovers")) + d.addCallback(lambda ign: self._hang(self.servers[2:3])) d.addCallback(lambda ign: self._hang(self.servers[3:])) + d.addCallback(lambda ign: self._unhang(self.servers[2:3])) d.addCallback(lambda ign: self._download_and_check()) return d - def test_2_good_8_hung_then_1_recovers_immutable(self): + def test_2_good_8_hung_then_1_recovers_with_2_shares_immutable(self): d = defer.succeed(None) - d.addCallback(lambda ign: self._set_up(False, "test_2_good_8_hung_then_1_recovers")) + d.addCallback(lambda ign: self._set_up(False, "test_2_good_8_hung_then_1_recovers_with_2_shares")) + d.addCallback(lambda ign: self._copy_all_shares_from(self.servers[0:1], self.servers[2])) d.addCallback(lambda ign: self._hang(self.servers[2:3])) d.addCallback(lambda ign: self._hang(self.servers[3:])) d.addCallback(lambda ign: self._unhang(self.servers[2:3])) d.addCallback(lambda ign: self._download_and_check()) return d - def test_2_good_8_hung_then_1_recovers_mutable(self): + # The tests below do not currently pass for mutable files. The + # mutable-file downloader does not yet handle hung servers, and the tests + # hang forever (hence the use of SkipTest rather than .todo) + + def test_3_good_7_hung_mutable(self): raise unittest.SkipTest("still broken") d = defer.succeed(None) - d.addCallback(lambda ign: self._set_up(True, "test_2_good_8_hung_then_1_recovers")) - d.addCallback(lambda ign: self._hang(self.servers[2:3])) + d.addCallback(lambda ign: self._set_up(True, "test_3_good_7_hung")) d.addCallback(lambda ign: self._hang(self.servers[3:])) - d.addCallback(lambda ign: self._unhang(self.servers[2:3])) d.addCallback(lambda ign: self._download_and_check()) return d - def test_2_good_8_hung_then_1_recovers_with_2_shares_immutable(self): + def test_2_good_8_hung_then_1_recovers_mutable(self): + raise unittest.SkipTest("still broken") d = defer.succeed(None) - d.addCallback(lambda ign: self._set_up(False, "test_2_good_8_hung_then_1_recovers_with_2_shares")) - d.addCallback(lambda ign: self._copy_all_shares_from(self.servers[0:1], self.servers[2])) + d.addCallback(lambda ign: self._set_up(True, "test_2_good_8_hung_then_1_recovers")) d.addCallback(lambda ign: self._hang(self.servers[2:3])) d.addCallback(lambda ign: self._hang(self.servers[3:])) d.addCallback(lambda ign: self._unhang(self.servers[2:3])) -- 2.45.2