openstack
/
taskflow
Code Issues Proposed changes

Use assertIs(Not)None to check for None 

[H203] Use assertIs(Not)None to check for None (off by default) Unit
test assertions tend to give better messages for more specific
assertions. As a result, assertIsNone(...) is preferred over
assertEqual(None, ...) and assertIs(None, ...), and assertIsNotNone(...)
is preferred over assertNotEqual(None, ...) and assertIsNot(None,
...). Off by default.

Trivial fix

Change-Id: I5b6ac7d99f0689843eb98cb3e9b9b10531322640
This commit is contained in:
howardlee 2016-11-07 16:50:39 +08:00
parent c70b1ce0b4
commit 51a6a8b687
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
taskflow/tests/unit/persistence/base.py
View File

@ -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)

10
taskflow/tests/unit/test_failure.py
View File

@ -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):