From 38c58123caa559104f0ad7cfd52dd6373792398f Mon Sep 17 00:00:00 2001 From: weiweigu Date: Tue, 12 Jul 2016 11:41:52 +0800 Subject: [PATCH] Replace assertEqual(None, *) with assertIsNone in tests Replace assertEqual(None, *) with assertIsNone in tests to have more clear messages in case of failure. Change-Id: I74452af6d840bcf612fd3bb2521db9134460dd63 Closes-Bug: #1280522 --- taskflow/tests/unit/test_failure.py | 4 ++-- taskflow/tests/unit/test_storage.py | 6 +++--- taskflow/tests/unit/test_utils.py | 4 ++-- taskflow/tests/unit/worker_based/test_endpoint.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/taskflow/tests/unit/test_failure.py b/taskflow/tests/unit/test_failure.py index 0d0f26414..536ddbc79 100644 --- a/taskflow/tests/unit/test_failure.py +++ b/taskflow/tests/unit/test_failure.py @@ -64,7 +64,7 @@ class GeneralFailureObjTestsMixin(object): def test_check_str_not_there(self): val = 'ValueError' - self.assertEqual(None, self.fail_obj.check(val)) + self.assertIsNone(self.fail_obj.check(val)) def test_check_type(self): self.assertIs(self.fail_obj.check(RuntimeError), RuntimeError) @@ -306,7 +306,7 @@ class WrappedFailureTestCase(test.TestCase): fail_obj = _captured_failure('Woot!') wf = exceptions.WrappedFailure([fail_obj]) self.assertEqual(RuntimeError, wf.check(RuntimeError)) - self.assertEqual(None, wf.check(ValueError)) + self.assertIsNone(wf.check(ValueError)) def test_two_failures(self): fls = [ diff --git a/taskflow/tests/unit/test_storage.py b/taskflow/tests/unit/test_storage.py index dae5a22c0..7cc904bc7 100644 --- a/taskflow/tests/unit/test_storage.py +++ b/taskflow/tests/unit/test_storage.py @@ -179,7 +179,7 @@ class StorageTestMixin(object): def test_reset_unknown_task(self): s = self._get_storage() s.ensure_atom(test_utils.NoopTask('my task')) - self.assertEqual(None, s.reset('my task')) + self.assertIsNone(s.reset('my task')) def test_fetch_by_name(self): s = self._get_storage() @@ -215,7 +215,7 @@ class StorageTestMixin(object): s = self._get_storage() s.ensure_atom(test_utils.NoopTask('my task')) self.assertEqual(0.0, s.get_task_progress('my task')) - self.assertEqual(None, s.get_task_progress_details('my task')) + self.assertIsNone(s.get_task_progress_details('my task')) def test_task_progress(self): s = self._get_storage() @@ -248,7 +248,7 @@ class StorageTestMixin(object): s.set_task_progress('my task', 0.8, {}) self.assertEqual(0.8, s.get_task_progress('my task')) - self.assertEqual(None, s.get_task_progress_details('my task')) + self.assertIsNone(s.get_task_progress_details('my task')) def test_fetch_result_not_ready(self): s = self._get_storage() diff --git a/taskflow/tests/unit/test_utils.py b/taskflow/tests/unit/test_utils.py index effc54b50..72bddd289 100644 --- a/taskflow/tests/unit/test_utils.py +++ b/taskflow/tests/unit/test_utils.py @@ -103,7 +103,7 @@ class CachedPropertyTest(test.TestCase): def b(self): return 'b' - self.assertEqual(None, inspect.getdoc(A.b)) + self.assertIsNone(inspect.getdoc(A.b)) def test_threaded_access_property(self): called = collections.deque() @@ -172,7 +172,7 @@ class UriParseTest(test.TestCase): url = "rsync://test@www.yahoo.com:873" parsed = misc.parse_uri(url) self.assertEqual('test', parsed.username) - self.assertEqual(None, parsed.password) + self.assertIsNone(parsed.password) class TestSequenceMinus(test.TestCase): diff --git a/taskflow/tests/unit/worker_based/test_endpoint.py b/taskflow/tests/unit/worker_based/test_endpoint.py index 92d631283..59f0d766c 100644 --- a/taskflow/tests/unit/worker_based/test_endpoint.py +++ b/taskflow/tests/unit/worker_based/test_endpoint.py @@ -80,4 +80,4 @@ class TestEndpoint(test.TestCase): progress_callback=None, result=self.task_result, failures={}) - self.assertEqual(None, result) + self.assertIsNone(result)