From e62dec8b0ded0ef13685fb2d7f54ebd0f7742019 Mon Sep 17 00:00:00 2001
From: zhangyangyang <zhangyangyang@unionpay.com>
Date: Tue, 12 Sep 2017 21:18:42 +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: Idfca0b18bbbede9bf6afb7b6ead902d4abcc04eb
Closes-Bug: #1329757
---
 unit_tests/test_ceilometer_contexts.py | 4 ++--
 unit_tests/test_ceilometer_utils.py    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/unit_tests/test_ceilometer_contexts.py b/unit_tests/test_ceilometer_contexts.py
index 20df36d..1a4e51c 100644
--- a/unit_tests/test_ceilometer_contexts.py
+++ b/unit_tests/test_ceilometer_contexts.py
@@ -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()(), {})
diff --git a/unit_tests/test_ceilometer_utils.py b/unit_tests/test_ceilometer_utils.py
index 3d99628..5285dd2 100644
--- a/unit_tests/test_ceilometer_utils.py
+++ b/unit_tests/test_ceilometer_utils.py
@@ -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