Merge "Fix comparison with singletons"

5 files changed, 17 insertions, 17 deletions

diff --git a/contrib/docker-plugin/tests/test_docker_container.py b/contrib/docker-plugin/tests/test_docker_container.py
index 8ab79c42f..529340e7b 100644
--- a/contrib/docker-plugin/tests/test_docker_container.py
+++ b/contrib/docker-plugin/tests/test_docker_container.py
@@ -61,7 +61,7 @@ class DockerContainerTest(HeatTestCase):
             resource_name, t['Resources'][resource_name], stack)
         self.m.StubOutWithMock(resource, 'get_client')
         resource.get_client().MultipleTimes().AndReturn(FakeDockerClient())
-        self.assertEqual(None, resource.validate())
+        self.assertIsNone(resource.validate())
         self.m.ReplayAll()
         scheduler.TaskRunner(resource.create)()
         self.assertEqual(resource.state, (resource.CREATE,
@@ -76,7 +76,7 @@ class DockerContainerTest(HeatTestCase):
         container = self.create_container('Blog')
         self.assertTrue(container.resource_id)
         running = self.get_container_state(container)['Running']
-        self.assertEqual(True, running)
+        self.assertIs(True, running)
         self.m.VerifyAll()
 
     def test_resource_attributes(self):
@@ -99,7 +99,7 @@ class DockerContainerTest(HeatTestCase):
         self.assertEqual(container.state, (container.DELETE,
                                            container.COMPLETE))
         running = self.get_container_state(container)['Running']
-        self.assertEqual(False, running)
+        self.assertIs(False, running)
         self.m.VerifyAll()
 
     def test_resource_suspend_resume(self):
@@ -109,11 +109,11 @@ class DockerContainerTest(HeatTestCase):
         self.assertEqual(container.state, (container.SUSPEND,
                                            container.COMPLETE))
         running = self.get_container_state(container)['Running']
-        self.assertEqual(False, running)
+        self.assertIs(False, running)
         # Test resume
         scheduler.TaskRunner(container.resume)()
         self.assertEqual(container.state, (container.RESUME,
                                            container.COMPLETE))
         running = self.get_container_state(container)['Running']
-        self.assertEqual(True, running)
+        self.assertIs(True, running)
         self.m.VerifyAll()
diff --git a/contrib/rackspace/heat/tests/test_auto_scale.py b/contrib/rackspace/heat/tests/test_auto_scale.py
index ab8d993c5..1962537f7 100644
--- a/contrib/rackspace/heat/tests/test_auto_scale.py
+++ b/contrib/rackspace/heat/tests/test_auto_scale.py
@@ -521,7 +521,7 @@ class WebHookTest(HeatTestCase):
         self.stack = utils.parse_stack(template)
         self.stack.create()
         resource = self.stack['my_webhook']
-        self.assertIs(resource.FnGetAtt('capabilityUrl'), None)
+        self.assertIsNone(resource.FnGetAtt('capabilityUrl'))
 
     def test_update(self):
         self._setup_test_stack(self.webhook_template)
diff --git a/contrib/rackspace/heat/tests/test_cloud_loadbalancer.py b/contrib/rackspace/heat/tests/test_cloud_loadbalancer.py
index 2f45301fe..a7f1ca175 100644
--- a/contrib/rackspace/heat/tests/test_cloud_loadbalancer.py
+++ b/contrib/rackspace/heat/tests/test_cloud_loadbalancer.py
@@ -309,7 +309,7 @@ class LoadBalancerTest(HeatTestCase):
         rsrc, fake_loadbalancer = self._mock_loadbalancer(template,
                                                           self.lb_name,
                                                           expected)
-        self.assertEqual(rsrc.validate(), None)
+        self.assertIsNone(rsrc.validate())
 
         #test TCP_CLIENT_FIRST protocol
         template = self._set_template(template,
@@ -319,7 +319,7 @@ class LoadBalancerTest(HeatTestCase):
         rsrc, fake_loadbalancer = self._mock_loadbalancer(template,
                                                           self.lb_name,
                                                           expected)
-        self.assertEqual(rsrc.validate(), None)
+        self.assertIsNone(rsrc.validate())
 
     def test_validate_health_monitor(self):
         #test connect success
@@ -337,7 +337,7 @@ class LoadBalancerTest(HeatTestCase):
                                                           self.lb_name,
                                                           expected)
 
-        self.assertEqual(rsrc.validate(), None)
+        self.assertIsNone(rsrc.validate())
 
         #test connect failure
         #bodyRegex is only valid for type 'HTTP(S)'
@@ -366,7 +366,7 @@ class LoadBalancerTest(HeatTestCase):
         rsrc, fake_loadbalancer = self._mock_loadbalancer(template,
                                                           self.lb_name,
                                                           expected)
-        self.assertEqual(rsrc.validate(), None)
+        self.assertIsNone(rsrc.validate())
 
     def test_validate_ssl_termination(self):
         ssl_termination = {
@@ -395,7 +395,7 @@ class LoadBalancerTest(HeatTestCase):
         rsrc, fake_loadbalancer = self._mock_loadbalancer(template,
                                                           self.lb_name,
                                                           expected)
-        self.assertEqual(rsrc.validate(), None)
+        self.assertIsNone(rsrc.validate())
 
     def test_post_creation_access_list(self):
         access_list = [{"address": '192.168.1.1/0',
diff --git a/contrib/rackspace/heat/tests/test_clouddatabase.py b/contrib/rackspace/heat/tests/test_clouddatabase.py
index b40d61078..5a683eb4b 100644
--- a/contrib/rackspace/heat/tests/test_clouddatabase.py
+++ b/contrib/rackspace/heat/tests/test_clouddatabase.py
@@ -122,8 +122,8 @@ class CloudDBInstanceTest(HeatTestCase):
 
     def test_clouddbinstance(self):
         instance = self._setup_test_clouddbinstance('dbinstance')
-        self.assertEqual(instance.hostname, None)
-        self.assertEqual(instance.href, None)
+        self.assertIsNone(instance.hostname)
+        self.assertIsNone(instance.href)
 
     def test_clouddbinstance_create(self):
         instance = self._setup_test_clouddbinstance('dbinstance_create')
@@ -169,7 +169,7 @@ class CloudDBInstanceTest(HeatTestCase):
                            volume=30).AndReturn(fakedbinstance)
         self.m.ReplayAll()
         instance.handle_create()
-        self.assertEqual(instance._resolve_attribute('invalid-attrib'), None)
+        self.assertIsNone(instance._resolve_attribute('invalid-attrib'))
         self.m.VerifyAll()
 
     def test_clouddbinstance_delete(self):
@@ -187,7 +187,7 @@ class CloudDBInstanceTest(HeatTestCase):
             inject_property_error=False)
         self.m.ReplayAll()
         ret = instance.validate()
-        self.assertEqual(ret, None)
+        self.assertIsNone(ret)
         self.m.VerifyAll()
 
     def test_clouddbinstance_param_validation_fail(self):
diff --git a/contrib/rackspace/heat/tests/test_rackspace_cloud_server.py b/contrib/rackspace/heat/tests/test_rackspace_cloud_server.py
index 449898d48..85792517d 100644
--- a/contrib/rackspace/heat/tests/test_rackspace_cloud_server.py
+++ b/contrib/rackspace/heat/tests/test_rackspace_cloud_server.py
@@ -243,7 +243,7 @@ class RackspaceCloudServerTest(HeatTestCase):
         cs = cloud_server.CloudServer('cs_create_image_err',
                                       t['Resources']['WebServer'], stack)
 
-        self.assertEqual(None, cs.validate())
+        self.assertIsNone(cs.validate())
         self.m.VerifyAll()
 
     def test_cs_create_heatscript_nonzero_exit_status(self):
@@ -316,7 +316,7 @@ class RackspaceCloudServerTest(HeatTestCase):
         mox.Replay(get)
 
         scheduler.TaskRunner(cs.delete)()
-        self.assertTrue(cs.resource_id is None)
+        self.assertIsNone(cs.resource_id)
         self.assertEqual(cs.state, (cs.DELETE, cs.COMPLETE))
         self.m.VerifyAll()