assertEquals is deprecated, use assertEqual
Change-Id: Id3ebdf4862b02f2965199701a4994846bcecbb18
This commit is contained in:
parent
6914c4702f
commit
872f44c167
|
@ -236,9 +236,9 @@ class HorizonTests(BaseHorizonTests):
|
||||||
# Simulate ajax call
|
# Simulate ajax call
|
||||||
resp = self.client.get(url, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
|
resp = self.client.get(url, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
|
||||||
# Response should be HTTP 401 with redirect header
|
# Response should be HTTP 401 with redirect header
|
||||||
self.assertEquals(resp.status_code, 401)
|
self.assertEqual(resp.status_code, 401)
|
||||||
self.assertEquals(resp["X-Horizon-Location"],
|
self.assertEqual(resp["X-Horizon-Location"],
|
||||||
redirect_url)
|
redirect_url)
|
||||||
|
|
||||||
def test_required_permissions(self):
|
def test_required_permissions(self):
|
||||||
dash = horizon.get_dashboard("cats")
|
dash = horizon.get_dashboard("cats")
|
||||||
|
|
|
@ -506,10 +506,10 @@ class InstanceTests(test.TestCase):
|
||||||
res = self.client.get(url)
|
res = self.client.get(url)
|
||||||
|
|
||||||
self.assertItemsEqual(res.context['instance'].volumes, volumes)
|
self.assertItemsEqual(res.context['instance'].volumes, volumes)
|
||||||
self.assertEquals(res.context['instance'].volumes[0].device,
|
self.assertEqual(res.context['instance'].volumes[0].device,
|
||||||
"/dev/hda")
|
"/dev/hda")
|
||||||
self.assertEquals(res.context['instance'].volumes[1].device,
|
self.assertEqual(res.context['instance'].volumes[1].device,
|
||||||
"/dev/hdk")
|
"/dev/hdk")
|
||||||
|
|
||||||
@test.create_stubs({api.nova: ("server_get",
|
@test.create_stubs({api.nova: ("server_get",
|
||||||
"instance_volumes_list",
|
"instance_volumes_list",
|
||||||
|
|
|
@ -158,7 +158,7 @@ class ComputeApiTests(test.APITestCase):
|
||||||
all_tenants=True)
|
all_tenants=True)
|
||||||
for server in ret_val:
|
for server in ret_val:
|
||||||
self.assertIsInstance(server, api.nova.Server)
|
self.assertIsInstance(server, api.nova.Server)
|
||||||
self.assertEquals(page_size, len(ret_val))
|
self.assertEqual(page_size, len(ret_val))
|
||||||
self.assertTrue(has_more)
|
self.assertTrue(has_more)
|
||||||
|
|
||||||
def test_usage_get(self):
|
def test_usage_get(self):
|
||||||
|
@ -215,4 +215,4 @@ class ComputeApiTests(test.APITestCase):
|
||||||
expected_results = {"maxTotalCores": float("inf"),
|
expected_results = {"maxTotalCores": float("inf"),
|
||||||
"maxTotalInstances": 10}
|
"maxTotalInstances": 10}
|
||||||
for key in expected_results.keys():
|
for key in expected_results.keys():
|
||||||
self.assertEquals(ret_val[key], expected_results[key])
|
self.assertEqual(ret_val[key], expected_results[key])
|
||||||
|
|
|
@ -87,7 +87,7 @@ class QuotaTests(test.APITestCase):
|
||||||
expected_output = self.get_usages()
|
expected_output = self.get_usages()
|
||||||
|
|
||||||
# Compare internal structure of usages to expected.
|
# Compare internal structure of usages to expected.
|
||||||
self.assertEquals(quota_usages.usages, expected_output)
|
self.assertEqual(quota_usages.usages, expected_output)
|
||||||
|
|
||||||
@test.create_stubs({api.nova: ('server_list',
|
@test.create_stubs({api.nova: ('server_list',
|
||||||
'flavor_list',
|
'flavor_list',
|
||||||
|
@ -117,7 +117,7 @@ class QuotaTests(test.APITestCase):
|
||||||
expected_output = self.get_usages(with_volume=False)
|
expected_output = self.get_usages(with_volume=False)
|
||||||
|
|
||||||
# Compare internal structure of usages to expected.
|
# Compare internal structure of usages to expected.
|
||||||
self.assertEquals(quota_usages.usages, expected_output)
|
self.assertEqual(quota_usages.usages, expected_output)
|
||||||
|
|
||||||
@test.create_stubs({api.nova: ('server_list',
|
@test.create_stubs({api.nova: ('server_list',
|
||||||
'flavor_list',
|
'flavor_list',
|
||||||
|
@ -149,7 +149,7 @@ class QuotaTests(test.APITestCase):
|
||||||
'cores': {'available': 10, 'used': 0, 'quota': 10}})
|
'cores': {'available': 10, 'used': 0, 'quota': 10}})
|
||||||
|
|
||||||
# Compare internal structure of usages to expected.
|
# Compare internal structure of usages to expected.
|
||||||
self.assertEquals(quota_usages.usages, expected_output)
|
self.assertEqual(quota_usages.usages, expected_output)
|
||||||
|
|
||||||
@test.create_stubs({api.nova: ('server_list',
|
@test.create_stubs({api.nova: ('server_list',
|
||||||
'flavor_list',
|
'flavor_list',
|
||||||
|
@ -192,4 +192,4 @@ class QuotaTests(test.APITestCase):
|
||||||
'quota': float("inf")}})
|
'quota': float("inf")}})
|
||||||
|
|
||||||
# Compare internal structure of usages to expected.
|
# Compare internal structure of usages to expected.
|
||||||
self.assertEquals(quota_usages.usages, expected_output)
|
self.assertEqual(quota_usages.usages, expected_output)
|
||||||
|
|
Loading…
Reference in New Issue