From 870609211a34245dc42bf82254a4c6393d522965 Mon Sep 17 00:00:00 2001 From: Brian Gallew Date: Wed, 9 Nov 2016 06:11:34 -0800 Subject: [PATCH] Clean up items which are deprecated in 3 --- src/range_repair.py | 2 +- tests/test_execution_counts.py | 2 +- tests/test_ranges.py | 18 +++++++++--------- tests/test_retry.py | 28 ++++++++++++++-------------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/range_repair.py b/src/range_repair.py index 69cfe3a..e783553 100755 --- a/src/range_repair.py +++ b/src/range_repair.py @@ -66,7 +66,7 @@ def __call__(self, *args, **kwargs): else min(next_sleep, self.config.max_sleep)) next_sleep *= self.config.sleep_factor else: - logging.warn("Giving up execution. Failed too many times.") + logging.warning("Giving up execution. Failed too many times.") return result diff --git a/tests/test_execution_counts.py b/tests/test_execution_counts.py index e91f0af..0d049be 100644 --- a/tests/test_execution_counts.py +++ b/tests/test_execution_counts.py @@ -15,7 +15,7 @@ def test_ten_commands(self): results = open('logfile.count').readlines() # So 40 is the magic number because: # 10 tokens * 4 steps - self.assertEquals(len(results), 40) + self.assertEqual(len(results), 40) return test_ten_commands.slow=1 diff --git a/tests/test_ranges.py b/tests/test_ranges.py index f0f2791..2116ae9 100644 --- a/tests/test_ranges.py +++ b/tests/test_ranges.py @@ -46,7 +46,7 @@ def test_Murmur3_range_start_zero(self): t = range_repair.TokenContainer(self.f) for x in t.sub_range_generator(0, 3000, steps=5): resultset.append(x[0]) - self.assertEquals(resultset, [t.format(0), t.format(600), t.format(1200), t.format(1800), t.format(2400)]) + self.assertEqual(resultset, [t.format(0), t.format(600), t.format(1200), t.format(1800), t.format(2400)]) return def test_Murmur3_range_end_zero(self): @@ -54,7 +54,7 @@ def test_Murmur3_range_end_zero(self): t = range_repair.TokenContainer(self.f) for x in t.sub_range_generator(-3000, 0, steps=5): resultset.append(x[0]) - self.assertEquals(resultset, [t.format(-3000), t.format(-2400), t.format(-1800), t.format(-1200), t.format(-600)]) + self.assertEqual(resultset, [t.format(-3000), t.format(-2400), t.format(-1800), t.format(-1200), t.format(-600)]) return def test_Murmur3_range_wrap(self): @@ -63,7 +63,7 @@ def test_Murmur3_range_wrap(self): endpoint = (2**63)-30 for x in t.sub_range_generator(endpoint, -endpoint, steps=6): resultset.append(x[0]) - self.assertEquals(len(resultset), 7) + self.assertEqual(len(resultset), 7) return def test_Random_range_start_zero(self): @@ -73,7 +73,7 @@ def test_Random_range_start_zero(self): t.check_for_MD5_tokens() for x in t.sub_range_generator(0, 3000, steps=5): resultset.append(x[0]) - self.assertEquals(resultset, [t.format(0), t.format(600), t.format(1200), t.format(1800), t.format(2400)]) + self.assertEqual(resultset, [t.format(0), t.format(600), t.format(1200), t.format(1800), t.format(2400)]) return def test_Random_range_end_zero(self): @@ -83,7 +83,7 @@ def test_Random_range_end_zero(self): t.check_for_MD5_tokens() for x in t.sub_range_generator(-3000, 0, steps=5): resultset.append(x[0]) - self.assertEquals(resultset, [t.format(-3000), t.format(-2400), t.format(-1800), t.format(-1200), t.format(-600)]) + self.assertEqual(resultset, [t.format(-3000), t.format(-2400), t.format(-1800), t.format(-1200), t.format(-600)]) return def test_Random_range_wrap(self): @@ -94,11 +94,11 @@ def test_Random_range_wrap(self): t.check_for_MD5_tokens() for x in t.sub_range_generator(endpoint, -endpoint, steps=6): resultset.append(x[0]) - self.assertEquals(len(resultset), 6) + self.assertEqual(len(resultset), 6) return def test_Murmur3_format_length(self): t = range_repair.TokenContainer(self.f) - self.assertEquals(21, len(t.format(0))) - self.assertEquals(21, len(t.format(100))) - self.assertEquals(21, len(t.format(-100))) + self.assertEqual(21, len(t.format(0))) + self.assertEqual(21, len(t.format(100))) + self.assertEqual(21, len(t.format(-100))) diff --git a/tests/test_retry.py b/tests/test_retry.py index 5aa1c44..a4f52b4 100644 --- a/tests/test_retry.py +++ b/tests/test_retry.py @@ -36,34 +36,34 @@ def build_fake_retryer(nfails, maxtries, maxsleep=10): class RetryTests(unittest.TestCase): def test_first_execution_success(self): retryer, sleeps = build_fake_retryer(0, 5) - self.assertEquals(retryer(), True) - self.assertEquals(sleeps, []) + self.assertEqual(retryer(), True) + self.assertEqual(sleeps, []) def test_seconds_execution_success(self): retryer, sleeps = build_fake_retryer(1, 5) - self.assertEquals(retryer(), True) - self.assertEquals(sleeps, [1]) + self.assertEqual(retryer(), True) + self.assertEqual(sleeps, [1]) def test_third_execution_success(self): retryer, sleeps = build_fake_retryer(2, 5) - self.assertEquals(retryer(), True) - self.assertEquals(sleeps, [1, 2]) + self.assertEqual(retryer(), True) + self.assertEqual(sleeps, [1, 2]) def test_too_many_retries(self): retryer, sleeps = build_fake_retryer(10, 5) - self.assertEquals(retryer(), False) - self.assertEquals(sleeps, [1, 2, 4, 8]) + self.assertEqual(retryer(), False) + self.assertEqual(sleeps, [1, 2, 4, 8]) def test_max_sleep(self): retryer, sleeps = build_fake_retryer(10, 7) - self.assertEquals(retryer(), False) - self.assertEquals(sleeps, [1, 2, 4, 8, 10, 10]) + self.assertEqual(retryer(), False) + self.assertEqual(sleeps, [1, 2, 4, 8, 10, 10]) def test_disabling_max_sleep(self): retryer, sleeps = build_fake_retryer(10, 7, 0) - self.assertEquals(retryer(), False) - self.assertEquals(sleeps, [1, 2, 4, 8, 16, 32]) + self.assertEqual(retryer(), False) + self.assertEqual(sleeps, [1, 2, 4, 8, 16, 32]) retryer, sleeps = build_fake_retryer(10, 7, -1) - self.assertEquals(retryer(), False) - self.assertEquals(sleeps, [1, 2, 4, 8, 16, 32]) \ No newline at end of file + self.assertEqual(retryer(), False) + self.assertEqual(sleeps, [1, 2, 4, 8, 16, 32])