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
This commit is contained in:
Swapnil Kulkarni (coolsvap) 2016-01-07 11:53:59 +05:30 committed by Min Pae
parent d7168f57ce
commit 76e97efa29
9 changed files with 25 additions and 25 deletions

View File

@ -354,7 +354,7 @@ class TestCreateCluster(api.APITest,
data_2.json["id"]) data_2.json["id"])
# verify second cluster was created after first by created_at time # 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") "Second cluster was not created after first")
cluster_1_created_at = cluster_1.created_at cluster_1_created_at = cluster_1.created_at
@ -368,7 +368,7 @@ class TestCreateCluster(api.APITest,
data_1.json["id"]) data_1.json["id"])
# verify updated_at time is after created_at # 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") "Cluster updated at time is invalid")
# verify created_at time did not change # verify created_at time did not change
self.assertEqual(cluster_1_created_at, cluster_1.created_at, self.assertEqual(cluster_1_created_at, cluster_1.created_at,
@ -385,10 +385,10 @@ class TestCreateCluster(api.APITest,
cluster_1 = cluster_query.one() cluster_1 = cluster_query.one()
# verify deleted_at time is after created_at # 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") "Cluster deleted_at time is invalid")
# verify updated_at time is after deleted_at # 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") "Cluster deleted_at time is invalid")
def test_create_rabbit_authentication_missing(self): def test_create_rabbit_authentication_missing(self):

View File

@ -32,5 +32,5 @@ class TestCommonException(base.FunctionalTestCase):
mock_log_exception): mock_log_exception):
self.CONF.config(fatal_exception_format_errors=True) self.CONF.config(fatal_exception_format_errors=True)
self.assertRaises(TypeError, MissingKwargException) self.assertRaises(TypeError, MissingKwargException)
self.assertEqual(True, mock_log_error.called) self.assertTrue(mock_log_error.called)
self.assertEqual(True, mock_log_exception.called) self.assertTrue(mock_log_exception.called)

View File

@ -89,7 +89,7 @@ class ApiTests(base.FunctionalTestCase):
"invalid size value") "invalid size value")
self.assertEqual(cluster_values["volume_size"], db_cluster.volume_size, self.assertEqual(cluster_values["volume_size"], db_cluster.volume_size,
"invalid volume_size value") "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): def test_get_cluster_by_id(self):
"""Verifies create cluster DB API.""" """Verifies create cluster DB API."""
@ -113,7 +113,7 @@ class ApiTests(base.FunctionalTestCase):
"invalid flavor value") "invalid flavor value")
self.assertEqual(cluster_values["flavor"], node.flavor, self.assertEqual(cluster_values["flavor"], node.flavor,
"invalid flavor value") "invalid flavor value")
self.assertEqual(False, node.deleted, self.assertFalse(node.deleted,
"invalid deleted value") "invalid deleted value")
def test_get_endpoints_in_node(self): def test_get_endpoints_in_node(self):
@ -199,7 +199,7 @@ class ApiTests(base.FunctionalTestCase):
self.assertEqual(broker_id, broker.id, self.assertEqual(broker_id, broker.id,
"Query should have returned the same broker.") "Query should have returned the same broker.")
self.assertEqual(True, broker.deleted, self.assertTrue(broker.deleted,
"Broker deleted flag should be true.") "Broker deleted flag should be true.")
def test_update_broker(self): def test_update_broker(self):
@ -347,7 +347,7 @@ class ApiTests(base.FunctionalTestCase):
self.assertEqual(broker_metadata_id, broker_metadata.id, self.assertEqual(broker_metadata_id, broker_metadata.id,
"Query should have returned the same broker " + "Query should have returned the same broker " +
"metadata.") "metadata.")
self.assertEqual(True, broker_metadata.deleted, self.assertTrue(broker_metadata.deleted,
"Broker metadata deleted flag should be true.") "Broker metadata deleted flag should be true.")
def test_get_image_id_by_broker_name(self): def test_get_image_id_by_broker_name(self):

View File

@ -67,17 +67,17 @@ class MonitorFunctionalTests(base.FunctionalTestCase):
def test_check_lock(self): def test_check_lock(self):
# Lock should not be acquired yet # 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() self.cue_monitor_service.check()
# Lock should have been reacquired # 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') @mock.patch('tooz.drivers.zookeeper.ZooKeeperLock.acquire')
def test_lock_unacquirable(self, mock_acquire_lock): def test_lock_unacquirable(self, mock_acquire_lock):
self.cue_monitor_service.check() self.cue_monitor_service.check()
# Lock should not have been acquired # 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): def test_check(self):
tf_instance = tf_client.get_client_instance() tf_instance = tf_client.get_client_instance()

View File

@ -119,7 +119,7 @@ class BrokerObjectsTests(base.FunctionalTestCase):
updated_broker = broker_query.one() updated_broker = broker_query.one()
self.assertEqual('rabbit1.0', updated_broker.name) self.assertEqual('rabbit1.0', updated_broker.name)
self.assertEqual(False, updated_broker.active) self.assertFalse(updated_broker.active)
def test_get_brokers(self): def test_get_brokers(self):
"""Tests getting all brokers from Broker objects API.""" """Tests getting all brokers from Broker objects API."""

View File

@ -83,4 +83,4 @@ class CreatePortTests(base.FunctionalTestCase):
found = True found = True
break break
self.assertEqual(True, found, "New port was not found") self.assertTrue(found, "New port was not found")

View File

@ -76,7 +76,7 @@ class DeletePortTests(base.FunctionalTestCase):
pre_port_list = self.neutron_client.list_ports() pre_port_list = self.neutron_client.list_ports()
# search for created port in port list # 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) "port-id %s not found in neutron port list" % port_id)
engines.run(self.flow, store=task_store) engines.run(self.flow, store=task_store)
@ -85,7 +85,7 @@ class DeletePortTests(base.FunctionalTestCase):
post_port_list = self.neutron_client.list_ports() post_port_list = self.neutron_client.list_ports()
# search for deleted port in port list # 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 " "port-id %s found in neutron port after "
"delete" % port_id) "delete" % port_id)
@ -114,7 +114,7 @@ class DeletePortTests(base.FunctionalTestCase):
# search for created port in port list # search for created port in port list
for port_id in port_id_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) "port-id %s not found" % port_id)
engines.run(self.flow, store=task_store) engines.run(self.flow, store=task_store)
@ -123,7 +123,7 @@ class DeletePortTests(base.FunctionalTestCase):
post_port_list = self.neutron_client.list_ports() post_port_list = self.neutron_client.list_ports()
# search for deleted port in port list # 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 " "port-id %s found in neutron port after "
"delete" % port_id) "delete" % port_id)
@ -137,7 +137,7 @@ class DeletePortTests(base.FunctionalTestCase):
# retrieve current port list # retrieve current port list
pre_port_list = self.neutron_client.list_ports() 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) "port-id %s found in neutron port list" % port_id)
# execute flow with parameters required for "CreatePort" task # execute flow with parameters required for "CreatePort" task

View File

@ -114,4 +114,4 @@ class DeleteVmTests(base.FunctionalTestCase):
for vm in new_instances: for vm in new_instances:
self.nova_client.servers.delete(vm) self.nova_client.servers.delete(vm)
self.assertEqual(False, vm_found, "VM was not deleted successfully") self.assertFalse(vm_found, "VM was not deleted successfully")

View File

@ -42,8 +42,8 @@ class TestCommonException(base.UnitTestCase):
@mock.patch('logging.LoggerAdapter.error') @mock.patch('logging.LoggerAdapter.error')
def test_missing_kwarg_exception(self, mock_log_error, mock_log_exception): def test_missing_kwarg_exception(self, mock_log_error, mock_log_exception):
MissingKwargException() MissingKwargException()
self.assertEqual(True, mock_log_error.called) self.assertTrue(mock_log_error.called)
self.assertEqual(True, mock_log_exception.called) self.assertTrue(mock_log_exception.called)
@mock.patch('logging.LoggerAdapter.exception') @mock.patch('logging.LoggerAdapter.exception')
@mock.patch('logging.LoggerAdapter.error') @mock.patch('logging.LoggerAdapter.error')
@ -51,8 +51,8 @@ class TestCommonException(base.UnitTestCase):
mock_log_error, mock_log_error,
mock_log_exception): mock_log_exception):
MissingKwargException() MissingKwargException()
self.assertEqual(True, mock_log_error.called) self.assertTrue(mock_log_error.called)
self.assertEqual(True, mock_log_exception.called) self.assertTrue(mock_log_exception.called)
def test_cleanse_dict(self): def test_cleanse_dict(self):
d = { d = {