From 603c5d7c2b8b1ecebe883dcf9165017d2a48170e Mon Sep 17 00:00:00 2001 From: melissaml Date: Wed, 13 Sep 2017 17:59:26 +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: Iba105cec858d7df40619901b2ede4acd7fcfa0c5 Closes-Bug: #1329757 --- unit_tests/test_glance_contexts.py | 64 +++++++++++----------- unit_tests/test_glance_relations.py | 82 ++++++++++++++--------------- unit_tests/test_glance_utils.py | 20 +++---- 3 files changed, 83 insertions(+), 83 deletions(-) diff --git a/unit_tests/test_glance_contexts.py b/unit_tests/test_glance_contexts.py index c622a6d6..34efe70d 100644 --- a/unit_tests/test_glance_contexts.py +++ b/unit_tests/test_glance_contexts.py @@ -40,37 +40,37 @@ class TestGlanceContexts(CharmTestCase): def test_swift_not_related(self): self.relation_ids.return_value = [] - self.assertEquals(contexts.ObjectStoreContext()(), {}) + self.assertEqual(contexts.ObjectStoreContext()(), {}) def test_swift_related(self): self.relation_ids.return_value = ['object-store:0'] - self.assertEquals(contexts.ObjectStoreContext()(), - {'swift_store': True}) + self.assertEqual(contexts.ObjectStoreContext()(), + {'swift_store': True}) def test_cinder_not_related(self): self.relation_ids.return_value = [] - self.assertEquals(contexts.CinderStoreContext()(), {}) + self.assertEqual(contexts.CinderStoreContext()(), {}) def test_cinder_related(self): self.relation_ids.return_value = ['cinder-volume-service:0'] - self.assertEquals(contexts.CinderStoreContext()(), - {'cinder_store': True}) + self.assertEqual(contexts.CinderStoreContext()(), + {'cinder_store': True}) def test_cinder_related_via_subordinate(self): self.relation_ids.return_value = ['cinder-backend:0'] - self.assertEquals(contexts.CinderStoreContext()(), - {'cinder_store': True}) + self.assertEqual(contexts.CinderStoreContext()(), + {'cinder_store': True}) def test_ceph_not_related(self): self.is_relation_made.return_value = False - self.assertEquals(contexts.CephGlanceContext()(), {}) + self.assertEqual(contexts.CephGlanceContext()(), {}) def test_ceph_related(self): self.is_relation_made.return_value = True service = 'glance' self.service_name.return_value = service self.config.return_value = True - self.assertEquals( + self.assertEqual( contexts.CephGlanceContext()(), {'rbd_pool': service, 'rbd_user': service, @@ -80,27 +80,27 @@ class TestGlanceContexts(CharmTestCase): def test_multistore_below_mitaka(self): self.os_release.return_value = 'liberty' self.relation_ids.return_value = ['random_rid'] - self.assertEquals(contexts.MultiStoreContext()(), - {'known_stores': "glance.store.filesystem.Store," - "glance.store.http.Store," - "glance.store.rbd.Store," - "glance.store.swift.Store"}) + self.assertEqual(contexts.MultiStoreContext()(), + {'known_stores': "glance.store.filesystem.Store," + "glance.store.http.Store," + "glance.store.rbd.Store," + "glance.store.swift.Store"}) def test_multistore_for_mitaka_and_upper(self): self.os_release.return_value = 'mitaka' self.relation_ids.return_value = ['random_rid'] - self.assertEquals(contexts.MultiStoreContext()(), - {'known_stores': "glance.store.filesystem.Store," - "glance.store.http.Store," - "glance.store.rbd.Store," - "glance.store.swift.Store," - "glance.store.cinder.Store"}) + self.assertEqual(contexts.MultiStoreContext()(), + {'known_stores': "glance.store.filesystem.Store," + "glance.store.http.Store," + "glance.store.rbd.Store," + "glance.store.swift.Store," + "glance.store.cinder.Store"}) def test_multistore_defaults(self): self.relation_ids.return_value = [] - self.assertEquals(contexts.MultiStoreContext()(), - {'known_stores': "glance.store.filesystem.Store," - "glance.store.http.Store"}) + self.assertEqual(contexts.MultiStoreContext()(), + {'known_stores': "glance.store.filesystem.Store," + "glance.store.http.Store"}) @patch('charmhelpers.contrib.hahelpers.cluster.config_get') @patch('charmhelpers.contrib.openstack.context.https') @@ -117,10 +117,10 @@ class TestGlanceContexts(CharmTestCase): ctxt.get_network_addresses = MagicMock() ctxt.get_network_addresses.return_value = [('1.2.3.4', '1.2.3.4')] - self.assertEquals(ctxt(), {'endpoints': [('1.2.3.4', '1.2.3.4', - 9282, 9272)], - 'ext_ports': [9282], - 'namespace': 'glance'}) + self.assertEqual(ctxt(), {'endpoints': [('1.2.3.4', '1.2.3.4', + 9282, 9272)], + 'ext_ports': [9282], + 'namespace': 'glance'}) @patch('charmhelpers.contrib.openstack.context.config') @patch("subprocess.check_output") @@ -130,8 +130,8 @@ class TestGlanceContexts(CharmTestCase): mock_config.return_value = True mock_subprocess.return_value = 'true' ctxt = contexts.GlanceIPv6Context() - self.assertEquals(ctxt(), {'bind_host': '::', - 'registry_host': '[::]'}) + self.assertEqual(ctxt(), {'bind_host': '::', + 'registry_host': '[::]'}) @patch('charmhelpers.contrib.openstack.context.config') @patch("subprocess.check_output") @@ -141,5 +141,5 @@ class TestGlanceContexts(CharmTestCase): mock_config.return_value = False mock_subprocess.return_value = 'false' ctxt = contexts.GlanceIPv6Context() - self.assertEquals(ctxt(), {'bind_host': '0.0.0.0', - 'registry_host': '0.0.0.0'}) + self.assertEqual(ctxt(), {'bind_host': '0.0.0.0', + 'registry_host': '0.0.0.0'}) diff --git a/unit_tests/test_glance_relations.py b/unit_tests/test_glance_relations.py index 1fbbc3e6..1308639d 100644 --- a/unit_tests/test_glance_relations.py +++ b/unit_tests/test_glance_relations.py @@ -243,9 +243,9 @@ class GlanceRelationTests(CharmTestCase): @patch.object(relations, 'CONFIGS') def test_db_changed_allowed(self, configs): self._shared_db_test(configs, 'glance/0') - self.assertEquals([call('/etc/glance/glance-registry.conf'), - call('/etc/glance/glance-api.conf')], - configs.write.call_args_list) + self.assertEqual([call('/etc/glance/glance-registry.conf'), + call('/etc/glance/glance-api.conf')], + configs.write.call_args_list) self.juju_log.assert_called_with( 'Cluster leader, performing db sync' ) @@ -254,17 +254,17 @@ class GlanceRelationTests(CharmTestCase): @patch.object(relations, 'CONFIGS') def test_db_changed_not_allowed(self, configs): self._shared_db_test(configs, 'glance/2') - self.assertEquals([call('/etc/glance/glance-registry.conf'), - call('/etc/glance/glance-api.conf')], - configs.write.call_args_list) + self.assertEqual([call('/etc/glance/glance-registry.conf'), + call('/etc/glance/glance-api.conf')], + configs.write.call_args_list) self.assertFalse(self.migrate_database.called) @patch.object(relations, 'CONFIGS') def test_db_changed_no_acls(self, configs): self._shared_db_test(configs, 'glance/2', None) - self.assertEquals([call('/etc/glance/glance-registry.conf'), - call('/etc/glance/glance-api.conf')], - configs.write.call_args_list) + self.assertEqual([call('/etc/glance/glance-registry.conf'), + call('/etc/glance/glance-api.conf')], + configs.write.call_args_list) self.assertFalse(self.migrate_database.called) @patch.object(relations, 'image_service_joined') @@ -278,9 +278,9 @@ class GlanceRelationTests(CharmTestCase): @patch.object(relations, 'CONFIGS') def test_postgresql_db_changed_no_essex(self, configs): self._postgresql_db_test(configs) - self.assertEquals([call('/etc/glance/glance-registry.conf'), - call('/etc/glance/glance-api.conf')], - configs.write.call_args_list) + self.assertEqual([call('/etc/glance/glance-registry.conf'), + call('/etc/glance/glance-api.conf')], + configs.write.call_args_list) self.juju_log.assert_called_with( 'Cluster leader, performing db sync' ) @@ -291,8 +291,8 @@ class GlanceRelationTests(CharmTestCase): self.os_release.return_value = "essex" self.call.return_value = 0 self._shared_db_test(configs, 'glance/0') - self.assertEquals([call('/etc/glance/glance-registry.conf')], - configs.write.call_args_list) + self.assertEqual([call('/etc/glance/glance-registry.conf')], + configs.write.call_args_list) self.juju_log.assert_called_with( 'Cluster leader, performing db sync' ) @@ -304,8 +304,8 @@ class GlanceRelationTests(CharmTestCase): self.os_release.return_value = "essex" self.call.return_value = 0 self._postgresql_db_test(configs) - self.assertEquals([call('/etc/glance/glance-registry.conf')], - configs.write.call_args_list) + self.assertEqual([call('/etc/glance/glance-registry.conf')], + configs.write.call_args_list) self.juju_log.assert_called_with( 'Cluster leader, performing db sync' ) @@ -324,8 +324,8 @@ class GlanceRelationTests(CharmTestCase): self.os_release.return_value = "essex" self.call.return_value = 1 self._shared_db_test(configs, 'glance/0') - self.assertEquals([call('/etc/glance/glance-registry.conf')], - configs.write.call_args_list) + self.assertEqual([call('/etc/glance/glance-registry.conf')], + configs.write.call_args_list) self.check_call.assert_called_with( ["glance-manage", "version_control", "0"] ) @@ -340,8 +340,8 @@ class GlanceRelationTests(CharmTestCase): self.os_release.return_value = "essex" self.call.return_value = 1 self._postgresql_db_test(configs) - self.assertEquals([call('/etc/glance/glance-registry.conf')], - configs.write.call_args_list) + self.assertEqual([call('/etc/glance/glance-registry.conf')], + configs.write.call_args_list) self.check_call.assert_called_with( ["glance-manage", "version_control", "0"] ) @@ -404,8 +404,8 @@ class GlanceRelationTests(CharmTestCase): 'object-store'] configs.write = MagicMock() relations.object_store_joined() - self.assertEquals([call('/etc/glance/glance-api.conf')], - configs.write.call_args_list) + self.assertEqual([call('/etc/glance/glance-api.conf')], + configs.write.call_args_list) def test_ceph_joined(self): relations.ceph_joined() @@ -489,9 +489,9 @@ class GlanceRelationTests(CharmTestCase): mock_request_complete.return_value = True self.ceph_config_file.return_value = '/etc/ceph/ceph.conf' relations.ceph_changed() - self.assertEquals([call('/etc/glance/glance-api.conf'), - call('/etc/ceph/ceph.conf')], - configs.write.call_args_list) + self.assertEqual([call('/etc/glance/glance-api.conf'), + call('/etc/ceph/ceph.conf')], + configs.write.call_args_list) self.service_restart.assert_called_with('glance-api') @patch.object(relations, 'CONFIGS') @@ -564,9 +564,9 @@ class GlanceRelationTests(CharmTestCase): configs.write = MagicMock() self.relation_ids.return_value = [] relations.keystone_changed() - self.assertEquals([call('/etc/glance/glance-api.conf'), - call('/etc/glance/glance-registry.conf')], - configs.write.call_args_list) + self.assertEqual([call('/etc/glance/glance-api.conf'), + call('/etc/glance/glance-registry.conf')], + configs.write.call_args_list) self.assertTrue(configure_https.called) @patch.object(relations, 'image_service_joined') @@ -588,9 +588,9 @@ class GlanceRelationTests(CharmTestCase): ['image-service:0'], ] relations.keystone_changed() - self.assertEquals([call('/etc/glance/glance-api.conf'), - call('/etc/glance/glance-registry.conf')], - configs.write.call_args_list) + self.assertEqual([call('/etc/glance/glance-api.conf'), + call('/etc/glance/glance-registry.conf')], + configs.write.call_args_list) object_store_joined.assert_called_with() self.assertTrue(configure_https.called) image_service_joined.assert_called_with('image-service:0') @@ -677,9 +677,9 @@ class GlanceRelationTests(CharmTestCase): configs.complete_contexts.return_value = ['cluster'] configs.write = MagicMock() relations.cluster_changed() - self.assertEquals([call('/etc/glance/glance-api.conf'), - call('/etc/haproxy/haproxy.cfg')], - configs.write.call_args_list) + self.assertEqual([call('/etc/glance/glance-api.conf'), + call('/etc/haproxy/haproxy.cfg')], + configs.write.call_args_list) @patch.object(relations, 'canonical_url') @patch.object(relations, 'relation_set') @@ -693,9 +693,9 @@ class GlanceRelationTests(CharmTestCase): self.get_relation_ip.return_value = '2001:db8:1::1' self.relation_ids.return_value = ['cluster:0'] relations.cluster_changed() - self.assertEquals([call('/etc/glance/glance-api.conf'), - call('/etc/haproxy/haproxy.cfg')], - configs.write.call_args_list) + self.assertEqual([call('/etc/glance/glance-api.conf'), + call('/etc/haproxy/haproxy.cfg')], + configs.write.call_args_list) @patch.object(utils, 'config') @patch.object(utils, 'token_cache_pkgs') @@ -918,8 +918,8 @@ class GlanceRelationTests(CharmTestCase): configs.complete_contexts.return_value = ['amqp'] configs.write = MagicMock() relations.amqp_changed() - self.assertEquals([call('/etc/glance/glance-api.conf')], - configs.write.call_args_list) + self.assertEqual([call('/etc/glance/glance-api.conf')], + configs.write.call_args_list) self.assertFalse(self.juju_log.called) @patch.object(relations, 'image_service_joined') @@ -954,8 +954,8 @@ class GlanceRelationTests(CharmTestCase): configs.complete_contexts.return_value = ['storage-backend'] configs.write = MagicMock() relations.storage_backend_hook() - self.assertEquals([call('/etc/glance/glance-api.conf')], - configs.write.call_args_list) + self.assertEqual([call('/etc/glance/glance-api.conf')], + configs.write.call_args_list) self.apt_install.assert_called_with( ["python-cinderclient", "python-os-brick", diff --git a/unit_tests/test_glance_utils.py b/unit_tests/test_glance_utils.py index 96995704..df6665e3 100644 --- a/unit_tests/test_glance_utils.py +++ b/unit_tests/test_glance_utils.py @@ -147,10 +147,10 @@ class TestGlanceUtils(CharmTestCase): (utils.HTTPS_APACHE_24_CONF, ['apache2']), (utils.MEMCACHED_CONF, ['memcached']) ]) - self.assertEquals(ex_map, utils.restart_map()) + self.assertEqual(ex_map, utils.restart_map()) self.enable_memcache.return_value = False del ex_map[utils.MEMCACHED_CONF] - self.assertEquals(ex_map, utils.restart_map()) + self.assertEqual(ex_map, utils.restart_map()) @patch.object(utils, 'token_cache_pkgs') @patch.object(utils, 'git_install_requested') @@ -159,10 +159,10 @@ class TestGlanceUtils(CharmTestCase): token_cache_pkgs.return_value = [] git_install_requested.return_value = False ex = utils.PACKAGES - self.assertEquals(set(ex), set(utils.determine_packages())) + self.assertEqual(set(ex), set(utils.determine_packages())) token_cache_pkgs.return_value = ['memcached'] ex.append('memcached') - self.assertEquals(set(ex), set(utils.determine_packages())) + self.assertEqual(set(ex), set(utils.determine_packages())) @patch.object(utils, 'token_cache_pkgs') @patch.object(utils, 'git_install_requested') @@ -174,7 +174,7 @@ class TestGlanceUtils(CharmTestCase): ex = utils.PACKAGES + utils.BASE_GIT_PACKAGES for p in utils.GIT_PACKAGE_BLACKLIST: ex.remove(p) - self.assertEquals(set(ex), set(result)) + self.assertEqual(set(ex), set(result)) @patch.object(utils, 'migrate_database') @patch.object(utils, 'git_install_requested') @@ -254,14 +254,14 @@ class TestGlanceUtils(CharmTestCase): call('/var/log/glance', owner='glance', group='glance', perms=0755, force=False), ] - self.assertEquals(mkdir.call_args_list, expected) + self.assertEqual(mkdir.call_args_list, expected) expected = [ call('/var/log/glance/glance-api.log', '', owner='glance', group='glance', perms=0600), call('/var/log/glance/glance-registry.log', '', owner='glance', group='glance', perms=0600), ] - self.assertEquals(write_file.call_args_list, expected) + self.assertEqual(write_file.call_args_list, expected) @patch('os.path.join') @patch('os.path.exists') @@ -313,12 +313,12 @@ class TestGlanceUtils(CharmTestCase): glance_registry_context, perms=0o644, templates_dir='joined-string'), ] - self.assertEquals(self.render.call_args_list, expected) + self.assertEqual(self.render.call_args_list, expected) expected = [ call('glance-api'), call('glance-registry'), ] - self.assertEquals(self.service_restart.call_args_list, expected) + self.assertEqual(self.service_restart.call_args_list, expected) @patch.object(utils, 'services') @patch('os.listdir') @@ -344,7 +344,7 @@ class TestGlanceUtils(CharmTestCase): call('git/glance-registry.init.in.template', 'joined-string', {'daemon_path': 'joined-string'}, perms=420), ] - self.assertEquals(self.render.call_args_list, expected) + self.assertEqual(self.render.call_args_list, expected) def test_assess_status(self): with patch.object(utils, 'assess_status_func') as asf: