diff options
| author | Ray Holder <ray@blacklocus.com> | 2014-03-30 22:32:08 -0500 |
|---|---|---|
| committer | Ray Holder <ray@blacklocus.com> | 2014-03-30 22:32:08 -0500 |
| commit | e2ba41fc763884bd07507bc85ef08ef0f93ce3e9 (patch) | |
| tree | 10962d8fde8689404751982e20b6bad92549c0c6 /test_retrying.py | |
| parent | f405d7ecc33cd31cfe8cc60cce70ba78cc444577 (diff) | |
| download | retrying-e2ba41fc763884bd07507bc85ef08ef0f93ce3e9.tar.gz | |
Fix up Python 2.6 and Python 3.2 compatibility
Diffstat (limited to 'test_retrying.py')
| -rw-r--r-- | test_retrying.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/test_retrying.py b/test_retrying.py index 611bffc..767167c 100644 --- a/test_retrying.py +++ b/test_retrying.py @@ -201,7 +201,7 @@ def retry_if_result_none(result): def retry_if_exception_of_type(retryable_types): def retry_if_exception_these_types(exception): - print "Detected Exception of type: " + str(type(exception)) + print "Detected Exception of type: {0}".format(str(type(exception))) return isinstance(exception, retryable_types) return retry_if_exception_these_types @@ -286,7 +286,7 @@ class TestDecoratorWrapper(unittest.TestCase): except RetryError as re: self.assertFalse(re.last_attempt.has_exception) self.assertEqual(3, re.last_attempt.attempt_number) - self.assertIsNone(re.last_attempt.value) + self.assertTrue(re.last_attempt.value is None) print re def test_retry_if_exception_of_type(self): @@ -305,9 +305,9 @@ class TestDecoratorWrapper(unittest.TestCase): except RetryError as re: self.assertEqual(3, re.last_attempt.attempt_number) self.assertTrue(re.last_attempt.has_exception) - self.assertIsNotNone(re.last_attempt.value[0]) + self.assertTrue(re.last_attempt.value[0] is not None) self.assertTrue(isinstance(re.last_attempt.value[1], IOError)) - self.assertIsNotNone(re.last_attempt.value[2]) + self.assertTrue(re.last_attempt.value[2] is not None) print re self.assertTrue(_retryable_test_with_exception_type_custom(NoCustomErrorAfterCount(5))) @@ -325,9 +325,9 @@ class TestDecoratorWrapper(unittest.TestCase): except RetryError as re: self.assertEqual(3, re.last_attempt.attempt_number) self.assertTrue(re.last_attempt.has_exception) - self.assertIsNotNone(re.last_attempt.value[0]) + self.assertTrue(re.last_attempt.value[0] is not None) self.assertTrue(isinstance(re.last_attempt.value[1], CustomError)) - self.assertIsNotNone(re.last_attempt.value[2]) + self.assertTrue(re.last_attempt.value[2] is not None) print re def test_wrapped_exception(self): @@ -348,9 +348,9 @@ class TestDecoratorWrapper(unittest.TestCase): except RetryError as re: self.assertEqual(3, re.last_attempt.attempt_number) self.assertTrue(re.last_attempt.has_exception) - self.assertIsNotNone(re.last_attempt.value[0]) + self.assertTrue(re.last_attempt.value[0] is not None) self.assertTrue(isinstance(re.last_attempt.value[1], IOError)) - self.assertIsNotNone(re.last_attempt.value[2]) + self.assertTrue(re.last_attempt.value[2] is not None) print re # custom error cases @@ -360,9 +360,9 @@ class TestDecoratorWrapper(unittest.TestCase): _retryable_test_with_exception_type_custom_wrap(NoNameErrorAfterCount(5)) self.fail("Expected RetryError") except RetryError as re: - self.assertIsNotNone(re.last_attempt.value[0]) + self.assertTrue(re.last_attempt.value[0] is not None) self.assertTrue(isinstance(re.last_attempt.value[1], NameError)) - self.assertIsNotNone(re.last_attempt.value[2]) + self.assertTrue(re.last_attempt.value[2] is not None) print re try: @@ -371,9 +371,9 @@ class TestDecoratorWrapper(unittest.TestCase): except RetryError as re: self.assertEqual(3, re.last_attempt.attempt_number) self.assertTrue(re.last_attempt.has_exception) - self.assertIsNotNone(re.last_attempt.value[0]) + self.assertTrue(re.last_attempt.value[0] is not None) self.assertTrue(isinstance(re.last_attempt.value[1], CustomError)) - self.assertIsNotNone(re.last_attempt.value[2]) + self.assertTrue(re.last_attempt.value[2] is not None) print re def test_defaults(self): |