Use test assertEqual instead of assert()

Avoid assert().

TrivialFix
Change-Id: Ic705d2879ff8f0825f663a2c8df5b7d112c33c59
This commit is contained in:
Dustin Lundquist 2016-10-27 07:58:15 -07:00
parent ae0ca96e8a
commit 0a5832d904
3 changed files with 6 additions and 11 deletions

View File

@ -116,8 +116,7 @@ class TestComputeTasks(base.TestCase):
user_data=None,
server_group_id=SERVER_GRPOUP_ID)
# Make sure it returns the expected compute_id
assert(compute_id == COMPUTE_ID)
self.assertEqual(COMPUTE_ID, compute_id)
# Test that a build exception is raised
createcompute = compute_tasks.ComputeCreate()
@ -179,8 +178,7 @@ class TestComputeTasks(base.TestCase):
user_data='test_ud_conf',
server_group_id=None)
# Make sure it returns the expected compute_id
assert(compute_id == COMPUTE_ID)
self.assertEqual(COMPUTE_ID, compute_id)
# Test that a build exception is raised
createcompute = compute_tasks.ComputeCreate()
@ -240,7 +238,6 @@ class TestComputeTasks(base.TestCase):
user_data=None,
server_group_id=SERVER_GRPOUP_ID)
# Make sure it returns the expected compute_id
self.assertEqual(COMPUTE_ID, compute_id)
# Test that a build exception is raised
@ -300,8 +297,7 @@ class TestComputeTasks(base.TestCase):
'/etc/octavia/amphora-agent.conf': 'test_conf'},
server_group_id=SERVER_GRPOUP_ID)
# Make sure it returns the expected compute_id
assert (compute_id == COMPUTE_ID)
self.assertEqual(COMPUTE_ID, compute_id)
# Test that a build exception is raised
self.useFixture(test_utils.OpenFixture(path, 'test'))
@ -403,8 +399,7 @@ class TestComputeTasks(base.TestCase):
mock_driver.create_server_group.assert_called_once_with(
'octavia-lb-123', 'anti-affinity')
# Make sure it returns the expected server group_id
assert(sg_id == server_group_test_id)
self.assertEqual(server_group_test_id, sg_id)
# Test revert()
nova_sever_group_obj.revert(sg_id)

View File

@ -173,7 +173,7 @@ class TestDatabaseTasks(base.TestCase):
status=constants.PENDING_CREATE,
cert_busy=False)
assert(amp_id == _amphora_mock.id)
self.assertEqual(_amphora_mock.id, amp_id)
# Test the revert
create_amp_in_db.revert(_tf_failure_mock)

View File

@ -139,7 +139,7 @@ class TestControllerWorker(base.TestCase):
_flow_mock.storage.fetch.assert_called_once_with('amphora')
assert (amp == AMP_ID)
self.assertEqual(AMP_ID, amp)
@mock.patch('octavia.controller.worker.flows.'
'amphora_flows.AmphoraFlows.get_delete_amphora_flow',