openstack
/
charm-ceilometer-agent
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: Idfca0b18bbbede9bf6afb7b6ead902d4abcc04eb
Closes-Bug: #1329757
This commit is contained in:
zhangyangyang 2017-09-12 21:18:42 +08:00
parent 2c47665758
commit e62dec8b0d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
unit_tests/test_ceilometer_contexts.py
View File

@ -58,8 +58,8 @@ class CeilometerContextsTest(CharmTestCase):
'metering_secret': 'secret'
}
self.test_relation.set(data)
self.assertEquals(contexts.CeilometerServiceContext()(), data)
self.assertEqual(contexts.CeilometerServiceContext()(), data)
def test_ceilometer_service_context_not_related(self):
self.relation_ids.return_value = []
self.assertEquals(contexts.CeilometerServiceContext()(), {})
self.assertEqual(contexts.CeilometerServiceContext()(), {})

8
unit_tests/test_ceilometer_utils.py
View File

@ -60,9 +60,9 @@ class CeilometerUtilsTest(CharmTestCase):
def test_restart_map(self):
self.enable_memcache.return_value = False
restart_map = utils.restart_map()
self.assertEquals(restart_map,
{'/etc/ceilometer/ceilometer.conf': [
'ceilometer-agent-compute']})
self.assertEqual(restart_map,
{'/etc/ceilometer/ceilometer.conf': [
'ceilometer-agent-compute']})
def test_restart_map_newton(self):
self.enable_memcache.return_value = True
@ -70,7 +70,7 @@ class CeilometerUtilsTest(CharmTestCase):
expect = {
'/etc/ceilometer/ceilometer.conf': ['ceilometer-agent-compute'],
'/etc/memcached.conf': ['memcached']}
self.assertEquals(restart_map, expect)
self.assertEqual(restart_map, expect)
def test_do_openstack_upgrade(self):
self.config.side_effect = self.test_config.get