openstack
/
trove-integration
Code Issues Proposed changes

Merge "Replace assertEqual(None, *) with assertIsNone"

This commit is contained in:
Jenkins 2016-09-14 15:29:55 +00:00 committed by Gerrit Code Review
parent bca4b2880b 4c2d8b72e8
commit 6216a4d48f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/integration/tests/dns/conversion.py
View File

@ -96,10 +96,10 @@ class WhenCreatingAnEntryForAnInstance(unittest.TestCase):
FLAGS.dns_domain_name)
self.assertEqual(expected_name, entry.name,
msg="Entry name should match - %s" % entry.name)
self.assertEqual(None, entry.content)
self.assertIsNone(entry.content)
self.assertEqual("A", entry.type)
self.assertEqual(FLAGS.dns_ttl, entry.ttl)
self.assertEqual(None, entry.priority)
self.assertIsNone(entry.priority)
self.assertEqual(FLAGS.dns_domain_name, entry.dns_zone.name)
if not entry.dns_zone.id:
self.fail(msg="DNS Zone Id should not be empty")

4
tests/integration/tests/volumes/driver.py
View File

@ -206,7 +206,7 @@ class AddVolumeFailure(VolumeTest):
Make call to FAIL a prov. volume and assert the return value is a
FAILURE.
"""
self.assertEqual(None, self.storyFail.volume_id)
self.assertIsNone(self.storyFail.volume_id)
name = "TestVolume"
desc = "A volume that was created for testing."
self.storyFail.volume_name = name
@ -257,7 +257,7 @@ class AddVolume(VolumeTest):
@time_out(60)
def test_add(self):
"""Make call to prov. a volume and assert the return value is OK."""
self.assertEqual(None, self.story.volume_id)
self.assertIsNone(self.story.volume_id)
name = "TestVolume"
desc = "A volume that was created for testing."
self.story.volume_name = name