diff options
author | Chang Bo Guo <guochbo@cn.ibm.com> | 2013-10-08 03:45:21 -0700 |
---|---|---|
committer | Chang Bo Guo <guochbo@cn.ibm.com> | 2013-10-14 19:34:25 -0700 |
commit | 66b313c635af4d225d9532976ce31857d200b790 (patch) | |
tree | a2eed6962d2a313a52dd8e2b168d9af37d8b9675 /trove | |
parent | 20f9beacdb7c6aa2ae1ad611229d0839ad9afe81 (diff) | |
download | trove-66b313c635af4d225d9532976ce31857d200b790.tar.gz |
Replace deprecated method aliases in tests
Some of the TestCase methods have been deprecated since python 2.7.
We need use correct names.
http://docs.python.org/2/library/unittest.html#deprecated-aliases
* replace 'assertEquals' with 'assertEqual'
* replace 'failUnlessAlmostEqual' with 'assertAlmostEqual'
Change-Id: I90da87723e3e36767946d276301b75af801b952d
Diffstat (limited to 'trove')
-rw-r--r-- | trove/tests/unittests/api/common/test_limits.py | 2 | ||||
-rw-r--r-- | trove/tests/unittests/guestagent/test_dbaas.py | 28 | ||||
-rw-r--r-- | trove/tests/unittests/quota/test_quota.py | 164 |
3 files changed, 97 insertions, 97 deletions
diff --git a/trove/tests/unittests/api/common/test_limits.py b/trove/tests/unittests/api/common/test_limits.py index e61247fa..a53dc9f8 100644 --- a/trove/tests/unittests/api/common/test_limits.py +++ b/trove/tests/unittests/api/common/test_limits.py @@ -419,7 +419,7 @@ class LimiterTest(BaseLimitTestSuite): expected = 60.0 / 7.0 results = self._check_sum(1, "POST", "/anything") - self.failUnlessAlmostEqual(expected, results, 8) + self.assertAlmostEqual(expected, results, 8) def test_delay_GET(self): # Ensure the 11th GET will result in NO delay. diff --git a/trove/tests/unittests/guestagent/test_dbaas.py b/trove/tests/unittests/guestagent/test_dbaas.py index 2487d70f..8b7ddbf9 100644 --- a/trove/tests/unittests/guestagent/test_dbaas.py +++ b/trove/tests/unittests/guestagent/test_dbaas.py @@ -211,8 +211,8 @@ class MySqlAdminTest(testtools.TestCase): expected = ("CREATE DATABASE IF NOT EXISTS " "`testDB` CHARACTER SET = 'latin2' " "COLLATE = 'latin2_general_ci';") - self.assertEquals(args[0].text, expected, - "Create database queries are not the same") + self.assertEqual(args[0].text, expected, + "Create database queries are not the same") self.assertEqual(1, dbaas.LocalSqlClient.execute.call_count, "The client object was not 2 times") @@ -229,15 +229,15 @@ class MySqlAdminTest(testtools.TestCase): expected = ("CREATE DATABASE IF NOT EXISTS " "`testDB` CHARACTER SET = 'latin2' " "COLLATE = 'latin2_general_ci';") - self.assertEquals(args[0].text, expected, - "Create database queries are not the same") + self.assertEqual(args[0].text, expected, + "Create database queries are not the same") args, _ = dbaas.LocalSqlClient.execute.call_args_list[1] expected = ("CREATE DATABASE IF NOT EXISTS " "`testDB2` CHARACTER SET = 'latin2' " "COLLATE = 'latin2_general_ci';") - self.assertEquals(args[0].text, expected, - "Create database queries are not the same") + self.assertEqual(args[0].text, expected, + "Create database queries are not the same") self.assertEqual(2, dbaas.LocalSqlClient.execute.call_count, "The client object was not 2 times") @@ -260,8 +260,8 @@ class MySqlAdminTest(testtools.TestCase): args, _ = dbaas.LocalSqlClient.execute.call_args expected = "DROP DATABASE `testDB`;" - self.assertEquals(args[0].text, expected, - "Delete database queries are not the same") + self.assertEqual(args[0].text, expected, + "Delete database queries are not the same") self.assertTrue(dbaas.LocalSqlClient.execute.called, "The client object was not called") @@ -277,8 +277,8 @@ class MySqlAdminTest(testtools.TestCase): if call_args is not None: args, _ = call_args expected = "DROP USER `testUser`;" - self.assertEquals(args[0].text, expected, - "Delete user queries are not the same") + self.assertEqual(args[0].text, expected, + "Delete user queries are not the same") self.assertTrue(dbaas.LocalSqlClient.execute.called, "The client object was not called") @@ -292,8 +292,8 @@ class MySqlAdminTest(testtools.TestCase): call_args = dbaas.LocalSqlClient.execute.call_args if call_args is not None: args, _ = call_args - self.assertEquals(args[0].text.strip(), expected, - "Create user queries are not the same") + self.assertEqual(args[0].text.strip(), expected, + "Create user queries are not the same") self.assertEqual(2, dbaas.LocalSqlClient.execute.call_count) def test_list_databases(self): @@ -997,8 +997,8 @@ class BaseDbStatusTest(testtools.TestCase): self.baseDbStatus.begin_install() - self.assertEquals(self.baseDbStatus.status, - rd_instance.ServiceStatuses.BUILDING) + self.assertEqual(self.baseDbStatus.status, + rd_instance.ServiceStatuses.BUILDING) def test_begin_restart(self): diff --git a/trove/tests/unittests/quota/test_quota.py b/trove/tests/unittests/quota/test_quota.py index 6517a092..c73dcf8f 100644 --- a/trove/tests/unittests/quota/test_quota.py +++ b/trove/tests/unittests/quota/test_quota.py @@ -108,7 +108,7 @@ class QuotaControllerTest(testtools.TestCase): result = self.controller.update(self.req, body, FAKE_TENANT1, FAKE_TENANT2) verify(quota, never).save() - self.assertEquals(200, result.status) + self.assertEqual(200, result.status) def test_update_resource_instance(self): instance_quota = mock(Quota) @@ -120,8 +120,8 @@ class QuotaControllerTest(testtools.TestCase): FAKE_TENANT2) verify(instance_quota, times=1).save() self.assertTrue('instances' in result._data['quotas']) - self.assertEquals(200, result.status) - self.assertEquals(2, result._data['quotas']['instances']) + self.assertEqual(200, result.status) + self.assertEqual(2, result._data['quotas']['instances']) @testtools.skipIf(not CONF.trove_volume_support, 'Volume support is not enabled') @@ -140,8 +140,8 @@ class QuotaControllerTest(testtools.TestCase): verify(instance_quota, never).save() self.assertFalse('instances' in result._data['quotas']) verify(volume_quota, times=1).save() - self.assertEquals(200, result.status) - self.assertEquals(10, result._data['quotas']['volumes']) + self.assertEqual(200, result.status) + self.assertEqual(10, result._data['quotas']['volumes']) class DbQuotaDriverTest(testtools.TestCase): @@ -190,9 +190,9 @@ class DbQuotaDriverTest(testtools.TestCase): quota = self.driver.get_quota_by_tenant(FAKE_TENANT1, Resource.VOLUMES) - self.assertEquals(FAKE_TENANT1, quota.tenant_id) - self.assertEquals(Resource.INSTANCES, quota.resource) - self.assertEquals(12, quota.hard_limit) + self.assertEqual(FAKE_TENANT1, quota.tenant_id) + self.assertEqual(Resource.INSTANCES, quota.resource) + self.assertEqual(12, quota.hard_limit) def test_get_quota_by_tenant_default(self): @@ -201,9 +201,9 @@ class DbQuotaDriverTest(testtools.TestCase): quota = self.driver.get_quota_by_tenant(FAKE_TENANT1, Resource.VOLUMES) - self.assertEquals(FAKE_TENANT1, quota.tenant_id) - self.assertEquals(Resource.VOLUMES, quota.resource) - self.assertEquals(CONF.max_volumes_per_user, quota.hard_limit) + self.assertEqual(FAKE_TENANT1, quota.tenant_id) + self.assertEqual(Resource.VOLUMES, quota.resource) + self.assertEqual(CONF.max_volumes_per_user, quota.hard_limit) def test_get_all_quotas_by_tenant(self): @@ -219,13 +219,13 @@ class DbQuotaDriverTest(testtools.TestCase): quotas = self.driver.get_all_quotas_by_tenant(FAKE_TENANT1, resources.keys()) - self.assertEquals(FAKE_TENANT1, quotas[Resource.INSTANCES].tenant_id) - self.assertEquals(Resource.INSTANCES, - quotas[Resource.INSTANCES].resource) - self.assertEquals(22, quotas[Resource.INSTANCES].hard_limit) - self.assertEquals(FAKE_TENANT1, quotas[Resource.VOLUMES].tenant_id) - self.assertEquals(Resource.VOLUMES, quotas[Resource.VOLUMES].resource) - self.assertEquals(15, quotas[Resource.VOLUMES].hard_limit) + self.assertEqual(FAKE_TENANT1, quotas[Resource.INSTANCES].tenant_id) + self.assertEqual(Resource.INSTANCES, + quotas[Resource.INSTANCES].resource) + self.assertEqual(22, quotas[Resource.INSTANCES].hard_limit) + self.assertEqual(FAKE_TENANT1, quotas[Resource.VOLUMES].tenant_id) + self.assertEqual(Resource.VOLUMES, quotas[Resource.VOLUMES].resource) + self.assertEqual(15, quotas[Resource.VOLUMES].hard_limit) def test_get_all_quotas_by_tenant_with_all_default(self): @@ -234,15 +234,15 @@ class DbQuotaDriverTest(testtools.TestCase): quotas = self.driver.get_all_quotas_by_tenant(FAKE_TENANT1, resources.keys()) - self.assertEquals(FAKE_TENANT1, quotas[Resource.INSTANCES].tenant_id) - self.assertEquals(Resource.INSTANCES, - quotas[Resource.INSTANCES].resource) - self.assertEquals(CONF.max_instances_per_user, - quotas[Resource.INSTANCES].hard_limit) - self.assertEquals(FAKE_TENANT1, quotas[Resource.VOLUMES].tenant_id) - self.assertEquals(Resource.VOLUMES, quotas[Resource.VOLUMES].resource) - self.assertEquals(CONF.max_volumes_per_user, - quotas[Resource.VOLUMES].hard_limit) + self.assertEqual(FAKE_TENANT1, quotas[Resource.INSTANCES].tenant_id) + self.assertEqual(Resource.INSTANCES, + quotas[Resource.INSTANCES].resource) + self.assertEqual(CONF.max_instances_per_user, + quotas[Resource.INSTANCES].hard_limit) + self.assertEqual(FAKE_TENANT1, quotas[Resource.VOLUMES].tenant_id) + self.assertEqual(Resource.VOLUMES, quotas[Resource.VOLUMES].resource) + self.assertEqual(CONF.max_volumes_per_user, + quotas[Resource.VOLUMES].hard_limit) def test_get_all_quotas_by_tenant_with_one_default(self): @@ -255,14 +255,14 @@ class DbQuotaDriverTest(testtools.TestCase): quotas = self.driver.get_all_quotas_by_tenant(FAKE_TENANT1, resources.keys()) - self.assertEquals(FAKE_TENANT1, quotas[Resource.INSTANCES].tenant_id) - self.assertEquals(Resource.INSTANCES, - quotas[Resource.INSTANCES].resource) - self.assertEquals(22, quotas[Resource.INSTANCES].hard_limit) - self.assertEquals(FAKE_TENANT1, quotas[Resource.VOLUMES].tenant_id) - self.assertEquals(Resource.VOLUMES, quotas[Resource.VOLUMES].resource) - self.assertEquals(CONF.max_volumes_per_user, - quotas[Resource.VOLUMES].hard_limit) + self.assertEqual(FAKE_TENANT1, quotas[Resource.INSTANCES].tenant_id) + self.assertEqual(Resource.INSTANCES, + quotas[Resource.INSTANCES].resource) + self.assertEqual(22, quotas[Resource.INSTANCES].hard_limit) + self.assertEqual(FAKE_TENANT1, quotas[Resource.VOLUMES].tenant_id) + self.assertEqual(Resource.VOLUMES, quotas[Resource.VOLUMES].resource) + self.assertEqual(CONF.max_volumes_per_user, + quotas[Resource.VOLUMES].hard_limit) def test_get_quota_usage_by_tenant(self): @@ -276,10 +276,10 @@ class DbQuotaDriverTest(testtools.TestCase): usage = self.driver.get_quota_usage_by_tenant(FAKE_TENANT1, Resource.VOLUMES) - self.assertEquals(FAKE_TENANT1, usage.tenant_id) - self.assertEquals(Resource.VOLUMES, usage.resource) - self.assertEquals(3, usage.in_use) - self.assertEquals(1, usage.reserved) + self.assertEqual(FAKE_TENANT1, usage.tenant_id) + self.assertEqual(Resource.VOLUMES, usage.resource) + self.assertEqual(3, usage.in_use) + self.assertEqual(1, usage.reserved) def test_get_quota_usage_by_tenant_default(self): @@ -294,10 +294,10 @@ class DbQuotaDriverTest(testtools.TestCase): usage = self.driver.get_quota_usage_by_tenant(FAKE_TENANT1, Resource.VOLUMES) - self.assertEquals(FAKE_TENANT1, usage.tenant_id) - self.assertEquals(Resource.VOLUMES, usage.resource) - self.assertEquals(0, usage.in_use) - self.assertEquals(0, usage.reserved) + self.assertEqual(FAKE_TENANT1, usage.tenant_id) + self.assertEqual(Resource.VOLUMES, usage.resource) + self.assertEqual(0, usage.in_use) + self.assertEqual(0, usage.reserved) def test_get_all_quota_usages_by_tenant(self): @@ -315,15 +315,15 @@ class DbQuotaDriverTest(testtools.TestCase): usages = self.driver.get_all_quota_usages_by_tenant(FAKE_TENANT1, resources.keys()) - self.assertEquals(FAKE_TENANT1, usages[Resource.INSTANCES].tenant_id) - self.assertEquals(Resource.INSTANCES, - usages[Resource.INSTANCES].resource) - self.assertEquals(2, usages[Resource.INSTANCES].in_use) - self.assertEquals(1, usages[Resource.INSTANCES].reserved) - self.assertEquals(FAKE_TENANT1, usages[Resource.VOLUMES].tenant_id) - self.assertEquals(Resource.VOLUMES, usages[Resource.VOLUMES].resource) - self.assertEquals(1, usages[Resource.VOLUMES].in_use) - self.assertEquals(1, usages[Resource.VOLUMES].reserved) + self.assertEqual(FAKE_TENANT1, usages[Resource.INSTANCES].tenant_id) + self.assertEqual(Resource.INSTANCES, + usages[Resource.INSTANCES].resource) + self.assertEqual(2, usages[Resource.INSTANCES].in_use) + self.assertEqual(1, usages[Resource.INSTANCES].reserved) + self.assertEqual(FAKE_TENANT1, usages[Resource.VOLUMES].tenant_id) + self.assertEqual(Resource.VOLUMES, usages[Resource.VOLUMES].resource) + self.assertEqual(1, usages[Resource.VOLUMES].in_use) + self.assertEqual(1, usages[Resource.VOLUMES].reserved) def test_get_all_quota_usages_by_tenant_with_all_default(self): @@ -342,15 +342,15 @@ class DbQuotaDriverTest(testtools.TestCase): usages = self.driver.get_all_quota_usages_by_tenant(FAKE_TENANT1, resources.keys()) - self.assertEquals(FAKE_TENANT1, usages[Resource.INSTANCES].tenant_id) - self.assertEquals(Resource.INSTANCES, - usages[Resource.INSTANCES].resource) - self.assertEquals(0, usages[Resource.INSTANCES].in_use) - self.assertEquals(0, usages[Resource.INSTANCES].reserved) - self.assertEquals(FAKE_TENANT1, usages[Resource.VOLUMES].tenant_id) - self.assertEquals(Resource.VOLUMES, usages[Resource.VOLUMES].resource) - self.assertEquals(0, usages[Resource.VOLUMES].in_use) - self.assertEquals(0, usages[Resource.VOLUMES].reserved) + self.assertEqual(FAKE_TENANT1, usages[Resource.INSTANCES].tenant_id) + self.assertEqual(Resource.INSTANCES, + usages[Resource.INSTANCES].resource) + self.assertEqual(0, usages[Resource.INSTANCES].in_use) + self.assertEqual(0, usages[Resource.INSTANCES].reserved) + self.assertEqual(FAKE_TENANT1, usages[Resource.VOLUMES].tenant_id) + self.assertEqual(Resource.VOLUMES, usages[Resource.VOLUMES].resource) + self.assertEqual(0, usages[Resource.VOLUMES].in_use) + self.assertEqual(0, usages[Resource.VOLUMES].reserved) def test_get_all_quota_usages_by_tenant_with_one_default(self): @@ -369,15 +369,15 @@ class DbQuotaDriverTest(testtools.TestCase): usages = self.driver.get_all_quota_usages_by_tenant(FAKE_TENANT1, resources.keys()) - self.assertEquals(FAKE_TENANT1, usages[Resource.INSTANCES].tenant_id) - self.assertEquals(Resource.INSTANCES, - usages[Resource.INSTANCES].resource) - self.assertEquals(0, usages[Resource.INSTANCES].in_use) - self.assertEquals(0, usages[Resource.INSTANCES].reserved) - self.assertEquals(FAKE_TENANT1, usages[Resource.VOLUMES].tenant_id) - self.assertEquals(Resource.VOLUMES, usages[Resource.VOLUMES].resource) - self.assertEquals(0, usages[Resource.VOLUMES].in_use) - self.assertEquals(0, usages[Resource.VOLUMES].reserved) + self.assertEqual(FAKE_TENANT1, usages[Resource.INSTANCES].tenant_id) + self.assertEqual(Resource.INSTANCES, + usages[Resource.INSTANCES].resource) + self.assertEqual(0, usages[Resource.INSTANCES].in_use) + self.assertEqual(0, usages[Resource.INSTANCES].reserved) + self.assertEqual(FAKE_TENANT1, usages[Resource.VOLUMES].tenant_id) + self.assertEqual(Resource.VOLUMES, usages[Resource.VOLUMES].resource) + self.assertEqual(0, usages[Resource.VOLUMES].in_use) + self.assertEqual(0, usages[Resource.VOLUMES].reserved) def test_reserve(self): @@ -400,13 +400,13 @@ class DbQuotaDriverTest(testtools.TestCase): delta = {'instances': 2, 'volumes': 3} self.driver.reserve(FAKE_TENANT1, resources, delta) _, kw = Reservation.create.call_args_list[0] - self.assertEquals(1, kw['usage_id']) - self.assertEquals(2, kw['delta']) - self.assertEquals(Reservation.Statuses.RESERVED, kw['status']) + self.assertEqual(1, kw['usage_id']) + self.assertEqual(2, kw['delta']) + self.assertEqual(Reservation.Statuses.RESERVED, kw['status']) _, kw = Reservation.create.call_args_list[1] - self.assertEquals(2, kw['usage_id']) - self.assertEquals(3, kw['delta']) - self.assertEquals(Reservation.Statuses.RESERVED, kw['status']) + self.assertEqual(2, kw['usage_id']) + self.assertEqual(3, kw['delta']) + self.assertEqual(Reservation.Statuses.RESERVED, kw['status']) def test_reserve_resource_unknown(self): @@ -508,13 +508,13 @@ class DbQuotaDriverTest(testtools.TestCase): delta = {'instances': -1, 'volumes': -3} self.driver.reserve(FAKE_TENANT1, resources, delta) _, kw = Reservation.create.call_args_list[0] - self.assertEquals(1, kw['usage_id']) - self.assertEquals(-1, kw['delta']) - self.assertEquals(Reservation.Statuses.RESERVED, kw['status']) + self.assertEqual(1, kw['usage_id']) + self.assertEqual(-1, kw['delta']) + self.assertEqual(Reservation.Statuses.RESERVED, kw['status']) _, kw = Reservation.create.call_args_list[1] - self.assertEquals(2, kw['usage_id']) - self.assertEquals(-3, kw['delta']) - self.assertEquals(Reservation.Statuses.RESERVED, kw['status']) + self.assertEqual(2, kw['usage_id']) + self.assertEqual(-3, kw['delta']) + self.assertEqual(Reservation.Statuses.RESERVED, kw['status']) def test_commit(self): |