From ff41397ccfaf21743b08a60f2ce3ebe8325a0f17 Mon Sep 17 00:00:00 2001 From: Seth Schoen Date: Thu, 14 May 2015 12:27:38 -0700 Subject: [PATCH] Consolidate redundant tests in a loop --- letsencrypt/tests/renewer_test.py | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/letsencrypt/tests/renewer_test.py b/letsencrypt/tests/renewer_test.py index 54c269da7..4ae76d04d 100644 --- a/letsencrypt/tests/renewer_test.py +++ b/letsencrypt/tests/renewer_test.py @@ -461,18 +461,11 @@ class RenewableCertTests(unittest.TestCase): "other chain")) # All of the subsequent versions should link directly to the original # privkey. - self.assertTrue(os.path.islink(self.test_rc.version("privkey", 6))) - self.assertTrue(os.path.islink(self.test_rc.version("privkey", 7))) - self.assertTrue(os.path.islink(self.test_rc.version("privkey", 8))) - self.assertEqual( - os.path.basename(os.readlink(self.test_rc.version("privkey", 6))), - "privkey3.pem") - self.assertEqual( - os.path.basename(os.readlink(self.test_rc.version("privkey", 7))), - "privkey3.pem") - self.assertEqual( - os.path.basename(os.readlink(self.test_rc.version("privkey", 8))), - "privkey3.pem") + for i in (6, 7, 8): + self.assertTrue(os.path.islink(self.test_rc.version("privkey", i))) + self.assertEqual("privkey3.pem", os.path.basename(os.readlink( + self.test_rc.version("privkey", i)))) + for kind in ALL_FOUR: self.assertEqual(self.test_rc.available_versions(kind), range(1, 9)) self.assertEqual(self.test_rc.current_version(kind), 3)