From: ZhiQiang Fan <aji.zqfan@gmail.com>
Date: Thu, 29 Aug 2013 05:46:04 +0000 (+0800)
Subject: Use assertEqual instead of assertEquals
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7753ce5fc3e489857e785dac08c951d32050f8d5;p=openstack-build%2Fneutron-build.git

Use assertEqual instead of assertEquals

Closes-Bug: #1218185

For unittest, assertEquals is deprecated in py3, use assertEqual
instead.

Change-Id: Ia71b51a0f2625aec5fb4644853a79c2ea80a799c
---

diff --git a/neutron/tests/unit/openvswitch/test_ovs_db.py b/neutron/tests/unit/openvswitch/test_ovs_db.py
index ca8d4dc0d..c7f2ff459 100644
--- a/neutron/tests/unit/openvswitch/test_ovs_db.py
+++ b/neutron/tests/unit/openvswitch/test_ovs_db.py
@@ -1,3 +1,5 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+#
 # Copyright (c) 2012 OpenStack Foundation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -278,8 +280,8 @@ class TunnelAllocationsTest(base.BaseTestCase):
         self.session.flush()
 
         tunnel = ovs_db_v2.add_tunnel_endpoint(addr)
-        self.assertEquals(tunnel.id, 1)
-        self.assertEquals(tunnel.ip_address, addr)
+        self.assertEqual(tunnel.id, 1)
+        self.assertEqual(tunnel.ip_address, addr)
 
     def test_add_tunnel_endpoint_handle_duplicate_error(self):
         with mock.patch.object(session.Session, 'query') as query_mock:
@@ -288,7 +290,7 @@ class TunnelAllocationsTest(base.BaseTestCase):
 
             with testtools.ExpectedException(q_exc.NeutronException):
                 ovs_db_v2.add_tunnel_endpoint('10.0.0.1', 5)
-            self.assertEquals(query_mock.call_count, 5)
+            self.assertEqual(query_mock.call_count, 5)
 
 
 class NetworkBindingsTest(test_plugin.NeutronDbPluginV2TestCase):