Replace the usage of assertEquals unit test alias removed in Python 3.12 with assertEqual

Author: hrnciar

src/etcd/tests/unit/test_client.py

@@ -137,8 +137,8 @@ def test__set_version_info(self):
             self.client._MGET
         )
         # Verify the properties while we are here
-        self.assertEquals('2.2.3', self.client.version)
-        self.assertEquals('2.3.0', self.client.cluster_version)
+        self.assertEqual('2.2.3', self.client.version)
+        self.assertEqual('2.3.0', self.client.cluster_version)
 
     def test_version_property(self):
         """Ensure the version property is set on first access."""
@@ -147,15 +147,15 @@ def test_version_property(self):
         self.client.api_execute.return_value.getheader.return_value = None
 
         # Verify the version property is set
-        self.assertEquals('2.2.3', self.client.version)
+        self.assertEqual('2.2.3', self.client.version)
 
     def test_cluster_version_property(self):
         """Ensure the cluster version property is set on first access."""
         data = {"etcdserver": "2.2.3", "etcdcluster": "2.3.0"}
         self._mock_api(200, data)
         self.client.api_execute.return_value.getheader.return_value = None
         # Verify the cluster_version property is set
-        self.assertEquals('2.3.0', self.client.cluster_version)
+        self.assertEqual('2.3.0', self.client.cluster_version)
 
     def test_get_headers_without_auth(self):
         client = etcd.Client()
@@ -191,7 +191,7 @@ def test_discover(self):
         etcd.Client.machines = mock.create_autospec(etcd.Client.machines, return_value=[u'https://etcd2.example.com:2379'])
         c = etcd.Client(srv_domain="example.com", allow_reconnect=True, protocol="https")
         etcd.Client.machines = self.machines
-        self.assertEquals(c.host, u'etcd1.example.com')
-        self.assertEquals(c.port, 2379)
-        self.assertEquals(c._machines_cache,
+        self.assertEqual(c.host, u'etcd1.example.com')
+        self.assertEqual(c.port, 2379)
+        self.assertEqual(c._machines_cache,
                           [u'https://etcd2.example.com:2379'])

src/etcd/tests/unit/test_lock.py

@@ -31,9 +31,9 @@ def test_initialization(self):
         """
         Verify the lock gets initialized correctly
         """
-        self.assertEquals(self.locker.name, u'test_lock')
-        self.assertEquals(self.locker.path, u'/_locks/test_lock')
-        self.assertEquals(self.locker.is_taken, False)
+        self.assertEqual(self.locker.name, u'test_lock')
+        self.assertEqual(self.locker.path, u'/_locks/test_lock')
+        self.assertEqual(self.locker.is_taken, False)
 
     def test_acquire(self):
         """
@@ -52,8 +52,8 @@ def test_acquire(self):
             }
         }
         self._mock_api(200, d)
-        self.assertEquals(l.acquire(), True)
-        self.assertEquals(l._sequence, '1')
+        self.assertEqual(l.acquire(), True)
+        self.assertEqual(l._sequence, '1')
 
     def test_is_acquired(self):
         """
@@ -70,19 +70,19 @@ def test_is_acquired(self):
         }
         self._mock_api(200, d)
         self.locker.is_taken = True
-        self.assertEquals(self.locker.is_acquired, True)
+        self.assertEqual(self.locker.is_acquired, True)
 
     def test_is_not_acquired(self):
         """
         Test is_acquired failures
         """
         self.locker._sequence = '2'
         self.locker.is_taken = False
-        self.assertEquals(self.locker.is_acquired, False)
+        self.assertEqual(self.locker.is_acquired, False)
         self.locker.is_taken = True
         self._mock_exception(etcd.EtcdKeyNotFound, self.locker.lock_key)
-        self.assertEquals(self.locker.is_acquired, False)
-        self.assertEquals(self.locker.is_taken, False)
+        self.assertEqual(self.locker.is_acquired, False)
+        self.assertEqual(self.locker.is_taken, False)
 
     def test_acquired(self):
         """
@@ -147,11 +147,11 @@ def test_lock_key(self):
         with self.assertRaises(ValueError):
             self.locker.lock_key
         self.locker._sequence = '5'
-        self.assertEquals(u'/_locks/test_lock/5',self.locker.lock_key)
+        self.assertEqual(u'/_locks/test_lock/5',self.locker.lock_key)
 
     def test_set_sequence(self):
         self.locker._set_sequence('/_locks/test_lock/10')
-        self.assertEquals('10', self.locker._sequence)
+        self.assertEqual('10', self.locker._sequence)
 
     def test_find_lock(self):
         d = {
@@ -171,11 +171,11 @@ def test_find_lock(self):
         self.locker._sequence = None
         self.recursive_read()
         self.assertTrue(self.locker._find_lock())
-        self.assertEquals(self.locker._sequence, '34')
+        self.assertEqual(self.locker._sequence, '34')
 
     def test_get_locker(self):
         self.recursive_read()
-        self.assertEquals((u'/_locks/test_lock/1', etcd.EtcdResult(node={'newKey': False, '_children': [], 'createdIndex': 33, 'modifiedIndex': 33, 'value': u'2qwwwq', 'expiration': None, 'key': u'/_locks/test_lock/1', 'ttl': None, 'action': None, 'dir': False})),
+        self.assertEqual((u'/_locks/test_lock/1', etcd.EtcdResult(node={'newKey': False, '_children': [], 'createdIndex': 33, 'modifiedIndex': 33, 'value': u'2qwwwq', 'expiration': None, 'key': u'/_locks/test_lock/1', 'ttl': None, 'action': None, 'dir': False})),
                           self.locker._get_locker())
         with self.assertRaises(etcd.EtcdLockExpired):
             self.locker._sequence = '35'

src/etcd/tests/unit/test_old_request.py

@@ -42,7 +42,7 @@ def test_set(self):
 
         result = client.set('/testkey', 'test', ttl=19)
 
-        self.assertEquals(
+        self.assertEqual(
             etcd.EtcdResult(
                 **{u'action': u'SET',
                    'node': {
@@ -67,7 +67,7 @@ def test_test_and_set(self):
                                           '"ttl":49,"modifiedIndex":203}}')
         )
         result = client.test_and_set('/testkey', 'newvalue', 'test', ttl=19)
-        self.assertEquals(
+        self.assertEqual(
             etcd.EtcdResult(
                 **{u'action': u'SET',
                    u'node': {
@@ -94,7 +94,7 @@ def test_test_and_test_failure(self):
                 'test', ttl=19)
         except ValueError as e:
             #from ipdb import set_trace; set_trace()
-            self.assertEquals(
+            self.assertEqual(
                 'The given PrevValue is not equal'
                 ' to the value of the key : TestAndSet: 1!=3', str(e))
 
@@ -111,7 +111,7 @@ def test_delete(self):
                                           '"modifiedIndex":189}}')
         )
         result = client.delete('/testkey')
-        self.assertEquals(etcd.EtcdResult(
+        self.assertEqual(etcd.EtcdResult(
             **{u'action': u'DELETE',
                u'node': {
                    u'expiration': u'2013-09-14T01:06:35.5242587+02:00',
@@ -133,7 +133,7 @@ def test_get(self):
         )
 
         result = client.get('/testkey')
-        self.assertEquals(etcd.EtcdResult(
+        self.assertEqual(etcd.EtcdResult(
             **{u'action': u'GET',
                u'node': {
                    u'modifiedIndex': 190,
@@ -154,7 +154,7 @@ def test_not_in(self):
         client = etcd.Client()
         client.get = mock.Mock(side_effect=etcd.EtcdKeyNotFound())
         result = '/testkey' not in client
-        self.assertEquals(True, result)
+        self.assertEqual(True, result)
 
     def test_in(self):
         """ Can check if key is in client """
@@ -169,7 +169,7 @@ def test_in(self):
         )
         result = '/testkey' in client
 
-        self.assertEquals(True, result)
+        self.assertEqual(True, result)
 
     def test_simple_watch(self):
         """ Can watch values """
@@ -186,7 +186,7 @@ def test_simple_watch(self):
                                           '"modifiedIndex":192}}')
         )
         result = client.watch('/testkey')
-        self.assertEquals(
+        self.assertEqual(
             etcd.EtcdResult(
                 **{u'action': u'SET',
                    u'node': {
@@ -213,7 +213,7 @@ def test_index_watch(self):
                                           '"modifiedIndex":180}}')
         )
         result = client.watch('/testkey', index=180)
-        self.assertEquals(
+        self.assertEqual(
             etcd.EtcdResult(
                 **{u'action': u'SET',
                    u'node': {
@@ -267,15 +267,15 @@ def test_get(self):
         response = FakeHTTPResponse(status=200, data='arbitrary json data')
         client.http.request = mock.Mock(return_value=response)
         result = client.api_execute('/v1/keys/testkey', client._MGET)
-        self.assertEquals('arbitrary json data'.encode('utf-8'), result.data)
+        self.assertEqual('arbitrary json data'.encode('utf-8'), result.data)
 
     def test_delete(self):
         """ http delete request """
         client = etcd.Client()
         response = FakeHTTPResponse(status=200, data='arbitrary json data')
         client.http.request = mock.Mock(return_value=response)
         result = client.api_execute('/v1/keys/testkey', client._MDELETE)
-        self.assertEquals('arbitrary json data'.encode('utf-8'), result.data)
+        self.assertEqual('arbitrary json data'.encode('utf-8'), result.data)
 
     def test_get_error(self):
         """ http get error request 101"""
@@ -289,15 +289,15 @@ def test_get_error(self):
             client.api_execute('/v2/keys/testkey', client._MGET)
             assert False
         except etcd.EtcdKeyNotFound as e:
-            self.assertEquals(str(e), 'message : cause')
+            self.assertEqual(str(e), 'message : cause')
 
     def test_put(self):
         """ http put request """
         client = etcd.Client()
         response = FakeHTTPResponse(status=200, data='arbitrary json data')
         client.http.request_encode_body = mock.Mock(return_value=response)
         result = client.api_execute('/v2/keys/testkey', client._MPUT)
-        self.assertEquals('arbitrary json data'.encode('utf-8'), result.data)
+        self.assertEqual('arbitrary json data'.encode('utf-8'), result.data)
 
     def test_test_and_set_error(self):
         """ http post error request 101 """
@@ -311,7 +311,7 @@ def test_test_and_set_error(self):
             client.api_execute('/v2/keys/testkey', client._MPUT, payload)
             self.fail()
         except ValueError as e:
-            self.assertEquals('message : cause', str(e))
+            self.assertEqual('message : cause', str(e))
 
     def test_set_not_file_error(self):
         """ http post error request 102 """
@@ -325,7 +325,7 @@ def test_set_not_file_error(self):
             client.api_execute('/v2/keys/testkey', client._MPUT, payload)
             self.fail()
         except etcd.EtcdNotFile as e:
-            self.assertEquals('message : cause', str(e))
+            self.assertEqual('message : cause', str(e))
 
     def test_get_error_unknown(self):
         """ http get error request unknown """