From 76e97efa295dad799e5e9a7038a5c2152b287255 Mon Sep 17 00:00:00 2001 From: "Swapnil Kulkarni (coolsvap)" Date: Thu, 7 Jan 2016 11:53:59 +0530 Subject: [PATCH] Use assertTrue/False instead of assertEqual(T/F) The usage of assertEqual(True/False, ***) should be changed to a meaningful format of assertTrue/False(***). Change-Id: Ibc6da6ddf0966da2441711a0460ca837209ae274 Closes-Bug:#1512207 --- cue/tests/functional/api/v1/test_cluster.py | 8 ++++---- cue/tests/functional/common/test_exception.py | 4 ++-- cue/tests/functional/db/test_api.py | 8 ++++---- cue/tests/functional/monitor/test_monitor.py | 6 +++--- cue/tests/functional/objects/test_broker.py | 2 +- cue/tests/functional/taskflow/task/test_create_port.py | 2 +- cue/tests/functional/taskflow/task/test_delete_port.py | 10 +++++----- cue/tests/functional/taskflow/task/test_delete_vm.py | 2 +- cue/tests/unit/common/test_exception.py | 8 ++++---- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/cue/tests/functional/api/v1/test_cluster.py b/cue/tests/functional/api/v1/test_cluster.py index 1c4eccc2..0aeec6b0 100644 --- a/cue/tests/functional/api/v1/test_cluster.py +++ b/cue/tests/functional/api/v1/test_cluster.py @@ -354,7 +354,7 @@ class TestCreateCluster(api.APITest, data_2.json["id"]) # verify second cluster was created after first by created_at time - self.assertEqual(True, cluster_2.created_at > cluster_1.created_at, + self.assertTrue(cluster_2.created_at > cluster_1.created_at, "Second cluster was not created after first") cluster_1_created_at = cluster_1.created_at @@ -368,7 +368,7 @@ class TestCreateCluster(api.APITest, data_1.json["id"]) # verify updated_at time is after created_at - self.assertEqual(True, cluster_1.updated_at > cluster_1.created_at, + self.assertTrue(cluster_1.updated_at > cluster_1.created_at, "Cluster updated at time is invalid") # verify created_at time did not change self.assertEqual(cluster_1_created_at, cluster_1.created_at, @@ -385,10 +385,10 @@ class TestCreateCluster(api.APITest, cluster_1 = cluster_query.one() # verify deleted_at time is after created_at - self.assertEqual(True, cluster_1.deleted_at > cluster_1.created_at, + self.assertTrue(cluster_1.deleted_at > cluster_1.created_at, "Cluster deleted_at time is invalid") # verify updated_at time is after deleted_at - self.assertEqual(True, cluster_1.updated_at > cluster_1.deleted_at, + self.assertTrue(cluster_1.updated_at > cluster_1.deleted_at, "Cluster deleted_at time is invalid") def test_create_rabbit_authentication_missing(self): diff --git a/cue/tests/functional/common/test_exception.py b/cue/tests/functional/common/test_exception.py index 0af09d6c..54ec5b95 100644 --- a/cue/tests/functional/common/test_exception.py +++ b/cue/tests/functional/common/test_exception.py @@ -32,5 +32,5 @@ class TestCommonException(base.FunctionalTestCase): mock_log_exception): self.CONF.config(fatal_exception_format_errors=True) self.assertRaises(TypeError, MissingKwargException) - self.assertEqual(True, mock_log_error.called) - self.assertEqual(True, mock_log_exception.called) + self.assertTrue(mock_log_error.called) + self.assertTrue(mock_log_exception.called) diff --git a/cue/tests/functional/db/test_api.py b/cue/tests/functional/db/test_api.py index 1a66dbbc..0dada2af 100644 --- a/cue/tests/functional/db/test_api.py +++ b/cue/tests/functional/db/test_api.py @@ -89,7 +89,7 @@ class ApiTests(base.FunctionalTestCase): "invalid size value") self.assertEqual(cluster_values["volume_size"], db_cluster.volume_size, "invalid volume_size value") - self.assertEqual(False, db_cluster.deleted, "invalid deleted value") + self.assertFalse(db_cluster.deleted, "invalid deleted value") def test_get_cluster_by_id(self): """Verifies create cluster DB API.""" @@ -113,7 +113,7 @@ class ApiTests(base.FunctionalTestCase): "invalid flavor value") self.assertEqual(cluster_values["flavor"], node.flavor, "invalid flavor value") - self.assertEqual(False, node.deleted, + self.assertFalse(node.deleted, "invalid deleted value") def test_get_endpoints_in_node(self): @@ -199,7 +199,7 @@ class ApiTests(base.FunctionalTestCase): self.assertEqual(broker_id, broker.id, "Query should have returned the same broker.") - self.assertEqual(True, broker.deleted, + self.assertTrue(broker.deleted, "Broker deleted flag should be true.") def test_update_broker(self): @@ -347,7 +347,7 @@ class ApiTests(base.FunctionalTestCase): self.assertEqual(broker_metadata_id, broker_metadata.id, "Query should have returned the same broker " + "metadata.") - self.assertEqual(True, broker_metadata.deleted, + self.assertTrue(broker_metadata.deleted, "Broker metadata deleted flag should be true.") def test_get_image_id_by_broker_name(self): diff --git a/cue/tests/functional/monitor/test_monitor.py b/cue/tests/functional/monitor/test_monitor.py index 2702bf15..9fc0cf86 100644 --- a/cue/tests/functional/monitor/test_monitor.py +++ b/cue/tests/functional/monitor/test_monitor.py @@ -67,17 +67,17 @@ class MonitorFunctionalTests(base.FunctionalTestCase): def test_check_lock(self): # Lock should not be acquired yet - self.assertEqual(False, self.cue_monitor_service.lock.acquired) + self.assertFalse(self.cue_monitor_service.lock.acquired) self.cue_monitor_service.check() # Lock should have been reacquired - self.assertEqual(True, self.cue_monitor_service.lock.acquired) + self.assertTrue(self.cue_monitor_service.lock.acquired) @mock.patch('tooz.drivers.zookeeper.ZooKeeperLock.acquire') def test_lock_unacquirable(self, mock_acquire_lock): self.cue_monitor_service.check() # Lock should not have been acquired - self.assertEqual(False, self.cue_monitor_service.lock.acquired) + self.assertFalse(self.cue_monitor_service.lock.acquired) def test_check(self): tf_instance = tf_client.get_client_instance() diff --git a/cue/tests/functional/objects/test_broker.py b/cue/tests/functional/objects/test_broker.py index cafba752..c447a75c 100644 --- a/cue/tests/functional/objects/test_broker.py +++ b/cue/tests/functional/objects/test_broker.py @@ -119,7 +119,7 @@ class BrokerObjectsTests(base.FunctionalTestCase): updated_broker = broker_query.one() self.assertEqual('rabbit1.0', updated_broker.name) - self.assertEqual(False, updated_broker.active) + self.assertFalse(updated_broker.active) def test_get_brokers(self): """Tests getting all brokers from Broker objects API.""" diff --git a/cue/tests/functional/taskflow/task/test_create_port.py b/cue/tests/functional/taskflow/task/test_create_port.py index 3d4d7b53..3e5dabcf 100644 --- a/cue/tests/functional/taskflow/task/test_create_port.py +++ b/cue/tests/functional/taskflow/task/test_create_port.py @@ -83,4 +83,4 @@ class CreatePortTests(base.FunctionalTestCase): found = True break - self.assertEqual(True, found, "New port was not found") + self.assertTrue(found, "New port was not found") diff --git a/cue/tests/functional/taskflow/task/test_delete_port.py b/cue/tests/functional/taskflow/task/test_delete_port.py index b52c5c68..f9ebbfa4 100644 --- a/cue/tests/functional/taskflow/task/test_delete_port.py +++ b/cue/tests/functional/taskflow/task/test_delete_port.py @@ -76,7 +76,7 @@ class DeletePortTests(base.FunctionalTestCase): pre_port_list = self.neutron_client.list_ports() # search for created port in port list - self.assertEqual(True, _find_port(port_id, pre_port_list), + self.assertTrue(_find_port(port_id, pre_port_list), "port-id %s not found in neutron port list" % port_id) engines.run(self.flow, store=task_store) @@ -85,7 +85,7 @@ class DeletePortTests(base.FunctionalTestCase): post_port_list = self.neutron_client.list_ports() # search for deleted port in port list - self.assertEqual(False, _find_port(port_id, post_port_list), + self.assertFalse(_find_port(port_id, post_port_list), "port-id %s found in neutron port after " "delete" % port_id) @@ -114,7 +114,7 @@ class DeletePortTests(base.FunctionalTestCase): # search for created port in port list for port_id in port_id_list: - self.assertEqual(True, _find_port(port_id, pre_port_list), + self.assertTrue(_find_port(port_id, pre_port_list), "port-id %s not found" % port_id) engines.run(self.flow, store=task_store) @@ -123,7 +123,7 @@ class DeletePortTests(base.FunctionalTestCase): post_port_list = self.neutron_client.list_ports() # search for deleted port in port list - self.assertEqual(False, _find_port(port_id, post_port_list), + self.assertFalse(_find_port(port_id, post_port_list), "port-id %s found in neutron port after " "delete" % port_id) @@ -137,7 +137,7 @@ class DeletePortTests(base.FunctionalTestCase): # retrieve current port list pre_port_list = self.neutron_client.list_ports() - self.assertEqual(False, _find_port(port_id, pre_port_list), + self.assertFalse(_find_port(port_id, pre_port_list), "port-id %s found in neutron port list" % port_id) # execute flow with parameters required for "CreatePort" task diff --git a/cue/tests/functional/taskflow/task/test_delete_vm.py b/cue/tests/functional/taskflow/task/test_delete_vm.py index 57c07d95..c52f41ef 100644 --- a/cue/tests/functional/taskflow/task/test_delete_vm.py +++ b/cue/tests/functional/taskflow/task/test_delete_vm.py @@ -114,4 +114,4 @@ class DeleteVmTests(base.FunctionalTestCase): for vm in new_instances: self.nova_client.servers.delete(vm) - self.assertEqual(False, vm_found, "VM was not deleted successfully") \ No newline at end of file + self.assertFalse(vm_found, "VM was not deleted successfully") \ No newline at end of file diff --git a/cue/tests/unit/common/test_exception.py b/cue/tests/unit/common/test_exception.py index 3efd9157..57b1d395 100644 --- a/cue/tests/unit/common/test_exception.py +++ b/cue/tests/unit/common/test_exception.py @@ -42,8 +42,8 @@ class TestCommonException(base.UnitTestCase): @mock.patch('logging.LoggerAdapter.error') def test_missing_kwarg_exception(self, mock_log_error, mock_log_exception): MissingKwargException() - self.assertEqual(True, mock_log_error.called) - self.assertEqual(True, mock_log_exception.called) + self.assertTrue(mock_log_error.called) + self.assertTrue(mock_log_exception.called) @mock.patch('logging.LoggerAdapter.exception') @mock.patch('logging.LoggerAdapter.error') @@ -51,8 +51,8 @@ class TestCommonException(base.UnitTestCase): mock_log_error, mock_log_exception): MissingKwargException() - self.assertEqual(True, mock_log_error.called) - self.assertEqual(True, mock_log_exception.called) + self.assertTrue(mock_log_error.called) + self.assertTrue(mock_log_exception.called) def test_cleanse_dict(self): d = {