From c59e04fbfaee1e042bd0bc82a1152f9d0e87c9a7 Mon Sep 17 00:00:00 2001
From: Zhongyue Luo <zhongyue.nah@intel.com>
Date: Fri, 11 Oct 2013 11:30:24 +0800
Subject: [PATCH] Replace assertEquals with assertEqual

The method assertEquals has been deprecated since python 2.7.
http://docs.python.org/2/library/unittest.html#deprecated-aliases

Also in Python 3, a deprecated warning is raised when using assertEquals.

Change-Id: Iba0ae72e72470cdf5b122defcd68effc5434f948
---
 tests/test_notifier.py   | 4 ++--
 tests/test_pool.py       | 2 +-
 tests/test_rabbit.py     | 2 +-
 tests/test_rpc_server.py | 4 ++--
 tests/test_target.py     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/test_notifier.py b/tests/test_notifier.py
index 2b3238307..f75a63432 100644
--- a/tests/test_notifier.py
+++ b/tests/test_notifier.py
@@ -238,8 +238,8 @@ class TestSerializer(test_utils.BaseTestCase):
             'timestamp': str(timeutils.utcnow.override_time),
         }
 
-        self.assertEquals(_impl_test.NOTIFICATIONS,
-                          [(dict(user='alice'), message, 'INFO')])
+        self.assertEqual(_impl_test.NOTIFICATIONS,
+                         [(dict(user='alice'), message, 'INFO')])
 
 
 class TestLogNotifier(test_utils.BaseTestCase):
diff --git a/tests/test_pool.py b/tests/test_pool.py
index 8ea2f07b3..768a766a4 100644
--- a/tests/test_pool.py
+++ b/tests/test_pool.py
@@ -118,7 +118,7 @@ class PoolTestCase(test_utils.BaseTestCase):
             self.assertIn(o, objs)
             objs.remove(o)
 
-        self.assertEquals(objs, [])
+        self.assertEqual(objs, [])
 
 
 PoolTestCase.generate_scenarios()
diff --git a/tests/test_rabbit.py b/tests/test_rabbit.py
index 48f11dc9c..240712ec2 100644
--- a/tests/test_rabbit.py
+++ b/tests/test_rabbit.py
@@ -100,7 +100,7 @@ class TestRabbitTransportURL(test_utils.BaseTestCase):
 
         driver.listen(target)
 
-        self.assertEquals(passed_params[0], self.expected)
+        self.assertEqual(passed_params[0], self.expected)
 
 
 class TestSendReceive(test_utils.BaseTestCase):
diff --git a/tests/test_rpc_server.py b/tests/test_rpc_server.py
index 8577c565c..4fe0a59a8 100644
--- a/tests/test_rpc_server.py
+++ b/tests/test_rpc_server.py
@@ -288,7 +288,7 @@ class TestRPCServer(test_utils.BaseTestCase, ServerSetupMixin):
             client.call({}, 'ping', arg='foo')
         except Exception as ex:
             self.assertIsInstance(ex, ValueError)
-            self.assertEquals(ex[0], 'dsfoo')
+            self.assertEqual(ex[0], 'dsfoo')
         else:
             self.assertTrue(False)
 
@@ -309,7 +309,7 @@ class TestRPCServer(test_utils.BaseTestCase, ServerSetupMixin):
             client.call({}, 'ping', arg='foo')
         except Exception as ex:
             self.assertIsInstance(ex, ValueError)
-            self.assertEquals(ex[0], 'dsfoo')
+            self.assertEqual(ex[0], 'dsfoo')
         else:
             self.assertTrue(False)
 
diff --git a/tests/test_target.py b/tests/test_target.py
index 98e25fa9a..a7d640451 100644
--- a/tests/test_target.py
+++ b/tests/test_target.py
@@ -170,7 +170,7 @@ class EqualityTestCase(test_utils.BaseTestCase):
             self.assertEqual(a, b)
             self.assertFalse(a != b)
         else:
-            self.assertNotEquals(a, b)
+            self.assertNotEqual(a, b)
             self.assertFalse(a == b)