diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-18 06:00:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-18 06:00:45 +0000 |
| commit | f79fef16455c68837bc4087eb2b2480abfc840bc (patch) | |
| tree | 0bece793946822b346ccede727f3325aa2d15eda | |
| parent | 33ffee30c1ee7471e9aa2efe2430cc8332cb0090 (diff) | |
| parent | 51a6a8b687c0508707c62bbb1adfd5744d119cce (diff) | |
| download | taskflow-f79fef16455c68837bc4087eb2b2480abfc840bc.tar.gz | |
Merge "Use assertIs(Not)None to check for None"
| -rw-r--r-- | taskflow/tests/unit/persistence/base.py | 2 | ||||
| -rw-r--r-- | taskflow/tests/unit/test_failure.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/taskflow/tests/unit/persistence/base.py b/taskflow/tests/unit/persistence/base.py index a52db50..d7e10bc 100644 --- a/taskflow/tests/unit/persistence/base.py +++ b/taskflow/tests/unit/persistence/base.py @@ -311,7 +311,7 @@ class PersistenceTestMixin(object): lb2 = conn.get_logbook(lb_id) fd2 = lb2.find(fd.uuid) td2 = fd2.find(td.uuid) - self.assertIsNot(td2, None) + self.assertIsNotNone(td2) self.assertEqual('detail-1', td2.name) self.assertEqual('4.2', td2.version) self.assertEqual(states.EXECUTE, td2.intention) diff --git a/taskflow/tests/unit/test_failure.py b/taskflow/tests/unit/test_failure.py index 536ddbc..99c2e70 100644 --- a/taskflow/tests/unit/test_failure.py +++ b/taskflow/tests/unit/test_failure.py @@ -70,7 +70,7 @@ class GeneralFailureObjTestsMixin(object): self.assertIs(self.fail_obj.check(RuntimeError), RuntimeError) def test_check_type_not_there(self): - self.assertIs(self.fail_obj.check(ValueError), None) + self.assertIsNone(self.fail_obj.check(ValueError)) class CaptureFailureTestCase(test.TestCase, GeneralFailureObjTestsMixin): @@ -102,10 +102,10 @@ class ReCreatedFailureTestCase(test.TestCase, GeneralFailureObjTestsMixin): exc_type_names=list(fail_obj)) def test_value_lost(self): - self.assertIs(self.fail_obj.exception, None) + self.assertIsNone(self.fail_obj.exception) def test_no_exc_info(self): - self.assertIs(self.fail_obj.exc_info, None) + self.assertIsNone(self.fail_obj.exc_info) def test_pformat_traceback(self): text = self.fail_obj.pformat(traceback=True) @@ -205,7 +205,7 @@ class FailureObjectTestCase(test.TestCase): self.assertEqual(expected, str(exc)) def test_empty_does_not_reraise(self): - self.assertIs(failure.Failure.reraise_if_any([]), None) + self.assertIsNone(failure.Failure.reraise_if_any([])) def test_reraises_one(self): fls = [_captured_failure('Woot!')] @@ -269,7 +269,7 @@ class FailureObjectTestCase(test.TestCase): def test_compares_to_none(self): captured = _captured_failure('Woot!') - self.assertNotEqual(captured, None) + self.assertIsNotNone(captured) self.assertFalse(captured.matches(None)) def test_pformat_traceback(self): |