From 6cb0ede0862e355166607920361346be9d16f8d9 Mon Sep 17 00:00:00 2001 From: zhangyangyang Date: Wed, 13 Sep 2017 21:41:11 +0800 Subject: [PATCH] change assert(Not)Equals to assert(Not)Equal According to http://docs.python.org/2/library/unittest.html assert(Not)Equals is a deprecated alias of assert(Not)Equal. Change-Id: Ib311e5de005f8601e534da15b5a51af024ba8d60 Closes-Bug: #1329757 --- unit_tests/test_heat_context.py | 6 +++--- unit_tests/test_heat_relations.py | 8 ++++---- unit_tests/test_heat_utils.py | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/unit_tests/test_heat_context.py b/unit_tests/test_heat_context.py index d37e03d..7eef616 100644 --- a/unit_tests/test_heat_context.py +++ b/unit_tests/test_heat_context.py @@ -32,7 +32,7 @@ class TestHeatContext(CharmTestCase): def test_encryption_configuration(self): self.get_encryption_key.return_value = 'key' self.leader_get.return_value = 'password' - self.assertEquals( + self.assertEqual( heat_context.HeatSecurityContext()(), {'encryption_key': 'key', 'heat_domain_admin_passwd': 'password'}) @@ -40,7 +40,7 @@ class TestHeatContext(CharmTestCase): def test_instance_user_empty_configuration(self): self.config.return_value = None - self.assertEquals( + self.assertEqual( heat_context.InstanceUserContext()(), {'instance_user': ''}) @@ -64,5 +64,5 @@ class TestHeatContext(CharmTestCase): final_result['keystone_ec2_url'] = \ self.generate_ec2_tokens.return_value - self.assertEquals( + self.assertEqual( heat_context.HeatIdentityServiceContext()(), final_result) diff --git a/unit_tests/test_heat_relations.py b/unit_tests/test_heat_relations.py index 765ae3a..6f55a49 100644 --- a/unit_tests/test_heat_relations.py +++ b/unit_tests/test_heat_relations.py @@ -143,8 +143,8 @@ class HeatRelationTests(CharmTestCase): @patch.object(relations, 'CONFIGS') def test_db_changed(self, configs): self._shared_db_test(configs) - self.assertEquals([call('/etc/heat/heat.conf')], - configs.write.call_args_list) + self.assertEqual([call('/etc/heat/heat.conf')], + configs.write.call_args_list) @patch.object(relations, 'CONFIGS') def test_db_changed_missing_relation_data(self, configs): @@ -175,8 +175,8 @@ class HeatRelationTests(CharmTestCase): configs.complete_contexts.return_value = ['amqp'] configs.write = MagicMock() relations.amqp_changed() - self.assertEquals([call('/etc/heat/heat.conf')], - configs.write.call_args_list) + self.assertEqual([call('/etc/heat/heat.conf')], + configs.write.call_args_list) @patch.object(relations, 'CONFIGS') def test_amqp_changed_missing_relation_data(self, configs): diff --git a/unit_tests/test_heat_utils.py b/unit_tests/test_heat_utils.py index 934ff4a..23e223c 100644 --- a/unit_tests/test_heat_utils.py +++ b/unit_tests/test_heat_utils.py @@ -66,7 +66,7 @@ class HeatUtilsTests(CharmTestCase): self.os_release.return_value = 'havana' pkgs = utils.determine_packages() ex = list(set(utils.BASE_PACKAGES + utils.BASE_SERVICES)) - self.assertEquals(ex, pkgs) + self.assertEqual(ex, pkgs) @patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext') def test_determine_packages_newton(self, subcontext): @@ -75,10 +75,10 @@ class HeatUtilsTests(CharmTestCase): pkgs = utils.determine_packages() ex = list(set(utils.BASE_PACKAGES + ['memcached'] + utils.BASE_SERVICES)) - self.assertEquals(ex, pkgs) + self.assertEqual(ex, pkgs) def test_restart_map(self): - self.assertEquals(RESTART_MAP, utils.restart_map()) + self.assertEqual(RESTART_MAP, utils.restart_map()) def test_openstack_upgrade(self): self.config.side_effect = None @@ -94,9 +94,9 @@ class HeatUtilsTests(CharmTestCase): def test_api_ports(self): cfn = utils.api_port('heat-api-cfn') - self.assertEquals(cfn, 8000) + self.assertEqual(cfn, 8000) cfn = utils.api_port('heat-api') - self.assertEquals(cfn, 8004) + self.assertEqual(cfn, 8004) def test_migrate_database(self): utils.migrate_database()