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

2 files changed, 4 insertions, 4 deletions

diff --git a/tests/integration/tests/dns/conversion.py b/tests/integration/tests/dns/conversion.py
index d22e993..2af3b95 100644
--- a/tests/integration/tests/dns/conversion.py
+++ b/tests/integration/tests/dns/conversion.py
@@ -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")
diff --git a/tests/integration/tests/volumes/driver.py b/tests/integration/tests/volumes/driver.py
index e21648f..6950046 100644
--- a/tests/integration/tests/volumes/driver.py
+++ b/tests/integration/tests/volumes/driver.py
@@ -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