openstack
/
charm-keystone
Code Issues Proposed changes

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: I90c835b3c7cdae6dceb5da061e5ed42bcfd77f4b
Closes-Bug: #1329757
This commit is contained in:
melissaml 2017-09-13 17:41:42 +08:00
parent 7fb7ff9063
commit db71637869
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
unit_tests/test_keystone_contexts.py
View File

@ -99,11 +99,11 @@ class TestKeystoneContexts(CharmTestCase):
ctxt.configure_cert = MagicMock()
ctxt.configure_ca = MagicMock()
ctxt.canonical_names = MagicMock()
self.assertEquals(ctxt(), {'endpoints': [('1.2.3.4',
'1.2.3.4',
34, 12)],
'namespace': 'keystone',
'ext_ports': [34]})
self.assertEqual(ctxt(), {'endpoints': [('1.2.3.4',
'1.2.3.4',
34, 12)],
'namespace': 'keystone',
'ext_ports': [34]})
self.assertTrue(mock_https.called)
mock_unit_get.assert_called_with('private-address')
@ -140,7 +140,7 @@ class TestKeystoneContexts(CharmTestCase):
ctxt = context.HAProxyContext()
self.maxDiff = None
self.assertEquals(
self.assertEqual(
ctxt(),
{'listen_ports': {'admin_port': '12',
'public_port': '12'},

8
unit_tests/test_keystone_hooks.py
View File

@ -309,8 +309,8 @@ class KeystoneRelationTests(CharmTestCase):
self.os_release.return_value = 'havana'
mock_ensure_ssl_cert_master.return_value = False
self._shared_db_test(configs, 'keystone/3')
self.assertEquals([call('/etc/keystone/keystone.conf')],
configs.write.call_args_list)
self.assertEqual([call('/etc/keystone/keystone.conf')],
configs.write.call_args_list)
self.assertTrue(leader_init.called)
@patch.object(hooks, 'leader_init_db_if_ready')
@ -322,8 +322,8 @@ class KeystoneRelationTests(CharmTestCase):
self.os_release.return_value = 'havana'
mock_ensure_ssl_cert_master.return_value = False
self._postgresql_db_test(configs)
self.assertEquals([call('/etc/keystone/keystone.conf')],
configs.write.call_args_list)
self.assertEqual([call('/etc/keystone/keystone.conf')],
configs.write.call_args_list)
self.assertTrue(leader_init.called)
@patch.object(hooks, 'update_all_domain_backends')

16
unit_tests/test_keystone_utils.py
View File

@ -127,13 +127,13 @@ class TestKeystoneUtils(CharmTestCase):
'/etc/apache2/sites-available/openstack_https_frontend.conf',
[self.ctxt]),
]
self.assertEquals(fake_renderer.register.call_args_list, ex_reg)
self.assertEqual(fake_renderer.register.call_args_list, ex_reg)
def test_determine_ports(self):
self.test_config.set('admin-port', '80')
self.test_config.set('service-port', '81')
result = utils.determine_ports()
self.assertEquals(result, ['80', '81'])
self.assertEqual(result, ['80', '81'])
@patch('charmhelpers.contrib.openstack.utils.config')
def test_determine_packages(self, _config):
@ -141,7 +141,7 @@ class TestKeystoneUtils(CharmTestCase):
_config.return_value = None
result = utils.determine_packages()
ex = utils.BASE_PACKAGES + ['keystone', 'python-keystoneclient']
self.assertEquals(set(ex), set(result))
self.assertEqual(set(ex), set(result))
@patch('charmhelpers.contrib.openstack.utils.config')
def test_determine_packages_git(self, _config):
@ -151,7 +151,7 @@ class TestKeystoneUtils(CharmTestCase):
ex = utils.BASE_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, 'disable_unused_apache_sites')
@patch('os.path.exists')
@ -813,7 +813,7 @@ class TestKeystoneUtils(CharmTestCase):
call('/var/log/keystone', owner='keystone',
group='keystone', perms=0755, force=False),
]
self.assertEquals(mkdir.call_args_list, expected)
self.assertEqual(mkdir.call_args_list, expected)
write_file.assert_called_with('/var/log/keystone/keystone.log',
'', owner='keystone', group='keystone',
perms=0600)
@ -856,7 +856,7 @@ class TestKeystoneUtils(CharmTestCase):
call('git.upstart', '/etc/init/keystone.conf',
keystone_context, perms=0o644, templates_dir='joined-string'),
]
self.assertEquals(self.render.call_args_list, expected)
self.assertEqual(self.render.call_args_list, expected)
self.service_restart.assert_called_with('keystone')
@patch.object(utils, 'get_manager')
@ -896,7 +896,7 @@ class TestKeystoneUtils(CharmTestCase):
read_data="some_data\n")):
isfile_mock.return_value = True
x = utils.get_file_stored_domain_id('/a/file')
self.assertEquals(x, 'some_data')
self.assertEqual(x, 'some_data')
def test_assess_status(self):
with patch.object(utils, 'assess_status_func') as asf:
@ -992,7 +992,7 @@ class TestKeystoneUtils(CharmTestCase):
call(['pgrep', 'httpd']),
call(['pgrep', 'httpd']),
]
self.assertEquals(self.subprocess.call.call_args_list, expected)
self.assertEqual(self.subprocess.call.call_args_list, expected)
def test_get_requested_grants(self):
settings = {'requested_grants': 'Admin,Member'}