From: david-sarah Date: Thu, 21 Jun 2012 20:46:27 +0000 (+0000) Subject: Tests for ref #1669. Also refactor the existing tests to reduce duplicated code and... X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/frontends/COPYING.GPL?a=commitdiff_plain;h=adca74d9f8a07d180dc213b36d1acc800b4caa8d;p=tahoe-lafs%2Ftahoe-lafs.git Tests for ref #1669. Also refactor the existing tests to reduce duplicated code and to fix a cut-and-paste error that caused one case (successful SDMF repair) to go untested. --- diff --git a/src/allmydata/test/test_mutable.py b/src/allmydata/test/test_mutable.py index c3867ca3..9dc1b96f 100644 --- a/src/allmydata/test/test_mutable.py +++ b/src/allmydata/test/test_mutable.py @@ -1974,102 +1974,78 @@ class Repair(unittest.TestCase, PublishMixin, ShouldFailMixin): self.failUnlessEqual(old_shares, current_shares) - def test_unrepairable_0shares(self): - d = self.publish_one() - def _delete_all_shares(ign): + def _test_whether_repairable(self, publisher, nshares, expected_result): + d = publisher() + def _delete_some_shares(ign): shares = self._storage._peers for peerid in shares: - shares[peerid] = {} - d.addCallback(_delete_all_shares) + for shnum in list(shares[peerid]): + if shnum >= nshares: + del shares[peerid][shnum] + d.addCallback(_delete_some_shares) d.addCallback(lambda ign: self._fn.check(Monitor())) - d.addCallback(lambda check_results: self._fn.repair(check_results)) - def _check(crr): - self.failUnlessEqual(crr.get_successful(), False) + def _check(cr): + self.failIf(cr.is_healthy()) + self.failUnlessEqual(cr.is_recoverable(), expected_result) + return cr d.addCallback(_check) - return d - - def test_mdmf_unrepairable_0shares(self): - d = self.publish_mdmf() - def _delete_all_shares(ign): - shares = self._storage._peers - for peerid in shares: - shares[peerid] = {} - d.addCallback(_delete_all_shares) - d.addCallback(lambda ign: self._fn.check(Monitor())) d.addCallback(lambda check_results: self._fn.repair(check_results)) - d.addCallback(lambda crr: self.failIf(crr.get_successful())) + d.addCallback(lambda crr: self.failUnlessEqual(crr.get_successful(), expected_result)) return d + def test_unrepairable_0shares(self): + return self._test_whether_repairable(self.publish_one, 0, False) + + def test_mdmf_unrepairable_0shares(self): + return self._test_whether_repairable(self.publish_mdmf, 0, False) def test_unrepairable_1share(self): - d = self.publish_one() - def _delete_all_shares(ign): - shares = self._storage._peers - for peerid in shares: - for shnum in list(shares[peerid]): - if shnum > 0: - del shares[peerid][shnum] - d.addCallback(_delete_all_shares) - d.addCallback(lambda ign: self._fn.check(Monitor())) - d.addCallback(lambda check_results: self._fn.repair(check_results)) - def _check(crr): - self.failUnlessEqual(crr.get_successful(), False) - d.addCallback(_check) - return d + return self._test_whether_repairable(self.publish_one, 1, False) def test_mdmf_unrepairable_1share(self): - d = self.publish_mdmf() - def _delete_all_shares(ign): - shares = self._storage._peers - for peerid in shares: - for shnum in list(shares[peerid]): - if shnum > 0: - del shares[peerid][shnum] - d.addCallback(_delete_all_shares) - d.addCallback(lambda ign: self._fn.check(Monitor())) - d.addCallback(lambda check_results: self._fn.repair(check_results)) - def _check(crr): - self.failUnlessEqual(crr.get_successful(), False) - d.addCallback(_check) - return d + return self._test_whether_repairable(self.publish_mdmf, 1, False) def test_repairable_5shares(self): - d = self.publish_mdmf() - def _delete_all_shares(ign): - shares = self._storage._peers - for peerid in shares: - for shnum in list(shares[peerid]): - if shnum > 4: - del shares[peerid][shnum] - d.addCallback(_delete_all_shares) - d.addCallback(lambda ign: self._fn.check(Monitor())) - d.addCallback(lambda check_results: self._fn.repair(check_results)) - def _check(crr): - self.failUnlessEqual(crr.get_successful(), True) - d.addCallback(_check) - return d + return self._test_whether_repairable(self.publish_one, 5, True) def test_mdmf_repairable_5shares(self): - d = self.publish_mdmf() + return self._test_whether_repairable(self.publish_mdmf, 5, True) + + def _test_whether_checkandrepairable(self, publisher, nshares, expected_result): + """ + Like the _test_whether_repairable tests, but invoking check_and_repair + instead of invoking check and then invoking repair. + """ + d = publisher() def _delete_some_shares(ign): shares = self._storage._peers for peerid in shares: for shnum in list(shares[peerid]): - if shnum > 5: + if shnum >= nshares: del shares[peerid][shnum] d.addCallback(_delete_some_shares) - d.addCallback(lambda ign: self._fn.check(Monitor())) - def _check(cr): - self.failIf(cr.is_healthy()) - self.failUnless(cr.is_recoverable()) - return cr - d.addCallback(_check) - d.addCallback(lambda check_results: self._fn.repair(check_results)) - def _check1(crr): - self.failUnlessEqual(crr.get_successful(), True) - d.addCallback(_check1) + d.addCallback(lambda ign: self._fn.check_and_repair(Monitor())) + d.addCallback(lambda crr: self.failUnlessEqual(crr.get_repair_successful(), expected_result)) return d + def test_unrepairable_0shares_checkandrepair(self): + return self._test_whether_checkandrepairable(self.publish_one, 0, False) + + def test_mdmf_unrepairable_0shares_checkandrepair(self): + return self._test_whether_checkandrepairable(self.publish_mdmf, 0, False) + + def test_unrepairable_1share_checkandrepair(self): + return self._test_whether_checkandrepairable(self.publish_one, 1, False) + + def test_mdmf_unrepairable_1share_checkandrepair(self): + return self._test_whether_checkandrepairable(self.publish_mdmf, 1, False) + + def test_repairable_5shares_checkandrepair(self): + return self._test_whether_checkandrepairable(self.publish_one, 5, True) + + def test_mdmf_repairable_5shares_checkandrepair(self): + return self._test_whether_checkandrepairable(self.publish_mdmf, 5, True) + def test_merge(self): self.old_shares = []