Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

Commit 710b1e1

Browse filesBrowse files
eirieiri
authored
Merge pull request #511 from tirkarthi/fix-assert
Use assertEqual instead of assertEquals for Python 3.11 compatibility.
2 parents dc66060 + ab94181 commit 710b1e1
Copy full SHA for 710b1e1
Expand file treeCollapse file tree

9 files changed

+162
-162
lines changed

‎tests/unit/changes_tests.py

Copy file name to clipboardExpand all lines: tests/unit/changes_tests.py
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -474,9 +474,9 @@ def test_get_feed_with_custom_filter_query_params(self):
474474
include_docs=False
475475
)
476476
params = feed._translate(feed._options)
477-
self.assertEquals(params['filter'], 'mailbox/new_mail')
478-
self.assertEquals(params['foo'], 'bar')
479-
self.assertEquals(params['include_docs'], 'false')
477+
self.assertEqual(params['filter'], 'mailbox/new_mail')
478+
self.assertEqual(params['foo'], 'bar')
479+
self.assertEqual(params['include_docs'], 'false')
480480

481481
def test_invalid_argument_type(self):
482482
"""

‎tests/unit/client_tests.py

Copy file name to clipboardExpand all lines: tests/unit/client_tests.py
+8-8Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ def test_session_basic(self, m_req):
266266
timeout=None
267267
)
268268

269-
self.assertEquals(all_dbs, ['animaldb'])
269+
self.assertEqual(all_dbs, ['animaldb'])
270270

271271
@mock.patch('cloudant._client_session.Session.request')
272272
def test_session_basic_with_no_credentials(self, m_req):
@@ -333,7 +333,7 @@ def test_change_credentials_basic(self, m_req):
333333
auth=('baz', 'qux'), # uses HTTP Basic Auth
334334
timeout=None
335335
)
336-
self.assertEquals(all_dbs, ['animaldb'])
336+
self.assertEqual(all_dbs, ['animaldb'])
337337

338338
@skip_if_not_cookie_auth
339339
def test_basic_auth_str(self):
@@ -442,7 +442,7 @@ def test_create_with_server_error(self, m_req):
442442

443443
self.assertEqual(cm.exception.status_code, 500)
444444

445-
self.assertEquals(m_req.call_count, 3)
445+
self.assertEqual(m_req.call_count, 3)
446446
m_req.assert_called_with(
447447
'PUT',
448448
'/'.join([self.url, dbname]),
@@ -730,7 +730,7 @@ def test_cloudant_bluemix_context_helper_with_legacy_creds(self):
730730
with cloudant_bluemix(vcap_services, instance_name=instance_name) as c:
731731
self.assertIsInstance(c, Cloudant)
732732
self.assertIsInstance(c.r_session, requests.Session)
733-
self.assertEquals(c.session()['userCtx']['name'], self.user)
733+
self.assertEqual(c.session()['userCtx']['name'], self.user)
734734
except Exception as err:
735735
self.fail('Exception {0} was raised.'.format(str(err)))
736736

@@ -809,7 +809,7 @@ def test_cloudant_bluemix_dedicated_context_helper(self):
809809
service_name=service_name) as c:
810810
self.assertIsInstance(c, Cloudant)
811811
self.assertIsInstance(c.r_session, requests.Session)
812-
self.assertEquals(c.session()['userCtx']['name'], self.user)
812+
self.assertEqual(c.session()['userCtx']['name'], self.user)
813813
except Exception as err:
814814
self.fail('Exception {0} was raised.'.format(str(err)))
815815

@@ -850,7 +850,7 @@ def test_bluemix_constructor_with_legacy_creds(self):
850850
c.connect()
851851
self.assertIsInstance(c, Cloudant)
852852
self.assertIsInstance(c.r_session, requests.Session)
853-
self.assertEquals(c.session()['userCtx']['name'], self.user)
853+
self.assertEqual(c.session()['userCtx']['name'], self.user)
854854

855855
except Exception as err:
856856
self.fail('Exception {0} was raised.'.format(str(err)))
@@ -916,7 +916,7 @@ def test_bluemix_constructor_specify_instance_name(self):
916916
c.connect()
917917
self.assertIsInstance(c, Cloudant)
918918
self.assertIsInstance(c.r_session, requests.Session)
919-
self.assertEquals(c.session()['userCtx']['name'], self.user)
919+
self.assertEqual(c.session()['userCtx']['name'], self.user)
920920

921921
except Exception as err:
922922
self.fail('Exception {0} was raised.'.format(str(err)))
@@ -960,7 +960,7 @@ def test_bluemix_constructor_with_multiple_services(self):
960960
c.connect()
961961
self.assertIsInstance(c, Cloudant)
962962
self.assertIsInstance(c.r_session, requests.Session)
963-
self.assertEquals(c.session()['userCtx']['name'], self.user)
963+
self.assertEqual(c.session()['userCtx']['name'], self.user)
964964

965965
except Exception as err:
966966
self.fail('Exception {0} was raised.'.format(str(err)))

‎tests/unit/database_partition_tests.py

Copy file name to clipboardExpand all lines: tests/unit/database_partition_tests.py
+11-11Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@ def test_create_non_partitioned_design_document(self):
6363
def test_partitioned_all_docs(self):
6464
for partition_key in self.populate_db_with_partitioned_documents(5, 25):
6565
docs = self.db.partitioned_all_docs(partition_key)
66-
self.assertEquals(len(docs['rows']), 25)
66+
self.assertEqual(len(docs['rows']), 25)
6767

6868
for doc in docs['rows']:
6969
self.assertTrue(doc['id'].startswith(partition_key + ':'))
7070

7171
def test_partition_metadata(self):
7272
for partition_key in self.populate_db_with_partitioned_documents(5, 25):
7373
meta = self.db.partition_metadata(partition_key)
74-
self.assertEquals(meta['partition'], partition_key)
75-
self.assertEquals(meta['doc_count'], 25)
74+
self.assertEqual(meta['partition'], partition_key)
75+
self.assertEqual(meta['doc_count'], 25)
7676

7777
def test_partitioned_search(self):
7878
ddoc = DesignDocument(self.db, 'partitioned_search', partitioned=True)
@@ -91,24 +91,24 @@ def test_partitioned_search(self):
9191
print(result)
9292
self.assertTrue(result['id'].startswith(partition_key + ':'))
9393
i += 1
94-
self.assertEquals(i, 10)
94+
self.assertEqual(i, 10)
9595

9696
def test_get_partitioned_index(self):
9797
index_name = 'test_partitioned_index'
9898

9999
self.db.create_query_index(index_name=index_name, fields=['foo'])
100100

101101
results = self.db.get_query_indexes()
102-
self.assertEquals(len(results), 2)
102+
self.assertEqual(len(results), 2)
103103

104104
index_all_docs = results[0]
105-
self.assertEquals(index_all_docs.name, '_all_docs')
106-
self.assertEquals(type(index_all_docs), SpecialIndex)
105+
self.assertEqual(index_all_docs.name, '_all_docs')
106+
self.assertEqual(type(index_all_docs), SpecialIndex)
107107
self.assertFalse(index_all_docs.partitioned)
108108

109109
index_partitioned = results[1]
110-
self.assertEquals(index_partitioned.name, index_name)
111-
self.assertEquals(type(index_partitioned), Index)
110+
self.assertEqual(index_partitioned.name, index_name)
111+
self.assertEqual(type(index_partitioned), Index)
112112
self.assertTrue(index_partitioned.partitioned)
113113

114114
def test_partitioned_query(self):
@@ -122,7 +122,7 @@ def test_partitioned_query(self):
122122
for result in results:
123123
self.assertTrue(result['_id'].startswith(partition_key + ':'))
124124
i += 1
125-
self.assertEquals(i, 10)
125+
self.assertEqual(i, 10)
126126

127127
def test_partitioned_view(self):
128128
ddoc = DesignDocument(self.db, 'partitioned_view', partitioned=True)
@@ -138,4 +138,4 @@ def test_partitioned_view(self):
138138
self.assertTrue(
139139
result['id'].startswith(partition_key + ':'))
140140
i += 1
141-
self.assertEquals(i, 10)
141+
self.assertEqual(i, 10)

‎tests/unit/database_tests.py

Copy file name to clipboardExpand all lines: tests/unit/database_tests.py
+65-65Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ def test_get_set_revision_limit(self, m_req):
885885
# Get new revisions limit.
886886
self.assertEqual(self.db.get_revision_limit(), 1234)
887887

888-
self.assertEquals(m_req.call_count, 3)
888+
self.assertEqual(m_req.call_count, 3)
889889

890890
@attr(db='couch')
891891
def test_view_clean_up(self):
@@ -1084,19 +1084,19 @@ def test_create_json_index(self):
10841084

10851085
ddoc = self.db[index.design_document_id]
10861086

1087-
self.assertEquals(ddoc['_id'], index.design_document_id)
1087+
self.assertEqual(ddoc['_id'], index.design_document_id)
10881088
self.assertTrue(ddoc['_rev'].startswith('1-'))
10891089

1090-
self.assertEquals(ddoc['indexes'], {})
1091-
self.assertEquals(ddoc['language'], 'query')
1092-
self.assertEquals(ddoc['lists'], {})
1093-
self.assertEquals(ddoc['shows'], {})
1090+
self.assertEqual(ddoc['indexes'], {})
1091+
self.assertEqual(ddoc['language'], 'query')
1092+
self.assertEqual(ddoc['lists'], {})
1093+
self.assertEqual(ddoc['shows'], {})
10941094

10951095
index = ddoc['views'][index.name]
1096-
self.assertEquals(index['map']['fields']['age'], 'asc')
1097-
self.assertEquals(index['map']['fields']['name'], 'asc')
1098-
self.assertEquals(index['options']['def']['fields'], ['name', 'age'])
1099-
self.assertEquals(index['reduce'], '_count')
1096+
self.assertEqual(index['map']['fields']['age'], 'asc')
1097+
self.assertEqual(index['map']['fields']['name'], 'asc')
1098+
self.assertEqual(index['options']['def']['fields'], ['name', 'age'])
1099+
self.assertEqual(index['reduce'], '_count')
11001100

11011101
@attr(couchapi=2)
11021102
def test_delete_json_index(self):
@@ -1369,22 +1369,22 @@ def test_create_text_index(self):
13691369

13701370
ddoc = self.db[index.design_document_id]
13711371

1372-
self.assertEquals(ddoc['_id'], index.design_document_id)
1372+
self.assertEqual(ddoc['_id'], index.design_document_id)
13731373
self.assertTrue(ddoc['_rev'].startswith('1-'))
13741374

1375-
self.assertEquals(ddoc['language'], 'query')
1376-
self.assertEquals(ddoc['lists'], {})
1377-
self.assertEquals(ddoc['shows'], {})
1378-
self.assertEquals(ddoc['views'], {})
1375+
self.assertEqual(ddoc['language'], 'query')
1376+
self.assertEqual(ddoc['lists'], {})
1377+
self.assertEqual(ddoc['shows'], {})
1378+
self.assertEqual(ddoc['views'], {})
13791379

13801380
text_index = ddoc['indexes'][index.name]
1381-
self.assertEquals(text_index['analyzer']['default'], 'keyword')
1382-
self.assertEquals(text_index['analyzer']['fields']['$default'], 'standard')
1383-
self.assertEquals(text_index['analyzer']['name'], 'perfield')
1384-
self.assertEquals(text_index['index']['default_analyzer'], 'keyword')
1385-
self.assertEquals(text_index['index']['default_field'], {})
1386-
self.assertEquals(text_index['index']['fields'], [{'name': 'name', 'type': 'string'}, {'name': 'age', 'type': 'number'}])
1387-
self.assertEquals(text_index['index']['selector'], {})
1381+
self.assertEqual(text_index['analyzer']['default'], 'keyword')
1382+
self.assertEqual(text_index['analyzer']['fields']['$default'], 'standard')
1383+
self.assertEqual(text_index['analyzer']['name'], 'perfield')
1384+
self.assertEqual(text_index['index']['default_analyzer'], 'keyword')
1385+
self.assertEqual(text_index['index']['default_field'], {})
1386+
self.assertEqual(text_index['index']['fields'], [{'name': 'name', 'type': 'string'}, {'name': 'age', 'type': 'number'}])
1387+
self.assertEqual(text_index['index']['selector'], {})
13881388
self.assertTrue(text_index['index']['index_array_lengths'])
13891389

13901390
def test_create_all_fields_text_index(self):
@@ -1396,22 +1396,22 @@ def test_create_all_fields_text_index(self):
13961396

13971397
ddoc = self.db[index.design_document_id]
13981398

1399-
self.assertEquals(ddoc['_id'], index.design_document_id)
1399+
self.assertEqual(ddoc['_id'], index.design_document_id)
14001400
self.assertTrue(ddoc['_rev'].startswith('1-'))
14011401

1402-
self.assertEquals(ddoc['language'], 'query')
1403-
self.assertEquals(ddoc['lists'], {})
1404-
self.assertEquals(ddoc['shows'], {})
1405-
self.assertEquals(ddoc['views'], {})
1402+
self.assertEqual(ddoc['language'], 'query')
1403+
self.assertEqual(ddoc['lists'], {})
1404+
self.assertEqual(ddoc['shows'], {})
1405+
self.assertEqual(ddoc['views'], {})
14061406

14071407
index = ddoc['indexes'][index.name]
1408-
self.assertEquals(index['analyzer']['default'], 'keyword')
1409-
self.assertEquals(index['analyzer']['fields'], {'$default': 'standard'})
1410-
self.assertEquals(index['analyzer']['name'], 'perfield')
1411-
self.assertEquals(index['index']['default_analyzer'], 'keyword')
1412-
self.assertEquals(index['index']['default_field'], {})
1413-
self.assertEquals(index['index']['fields'], 'all_fields')
1414-
self.assertEquals(index['index']['selector'], {})
1408+
self.assertEqual(index['analyzer']['default'], 'keyword')
1409+
self.assertEqual(index['analyzer']['fields'], {'$default': 'standard'})
1410+
self.assertEqual(index['analyzer']['name'], 'perfield')
1411+
self.assertEqual(index['index']['default_analyzer'], 'keyword')
1412+
self.assertEqual(index['index']['default_field'], {})
1413+
self.assertEqual(index['index']['fields'], 'all_fields')
1414+
self.assertEqual(index['index']['selector'], {})
14151415
self.assertTrue(index['index']['index_array_lengths'])
14161416

14171417
def test_create_multiple_indexes_one_ddoc(self):
@@ -1436,27 +1436,27 @@ def test_create_multiple_indexes_one_ddoc(self):
14361436

14371437
ddoc = self.db['_design/ddoc001']
14381438

1439-
self.assertEquals(ddoc['_id'], index.design_document_id)
1439+
self.assertEqual(ddoc['_id'], index.design_document_id)
14401440
self.assertTrue(ddoc['_rev'].startswith('2-'))
14411441

1442-
self.assertEquals(ddoc['language'], 'query')
1443-
self.assertEquals(ddoc['lists'], {})
1444-
self.assertEquals(ddoc['shows'], {})
1442+
self.assertEqual(ddoc['language'], 'query')
1443+
self.assertEqual(ddoc['lists'], {})
1444+
self.assertEqual(ddoc['shows'], {})
14451445

14461446
json_index = ddoc['views']['json-index-001']
1447-
self.assertEquals(json_index['map']['fields']['age'], 'asc')
1448-
self.assertEquals(json_index['map']['fields']['name'], 'asc')
1449-
self.assertEquals(json_index['options']['def']['fields'], ['name', 'age'])
1450-
self.assertEquals(json_index['reduce'], '_count')
1447+
self.assertEqual(json_index['map']['fields']['age'], 'asc')
1448+
self.assertEqual(json_index['map']['fields']['name'], 'asc')
1449+
self.assertEqual(json_index['options']['def']['fields'], ['name', 'age'])
1450+
self.assertEqual(json_index['reduce'], '_count')
14511451

14521452
text_index = ddoc['indexes']['text-index-001']
1453-
self.assertEquals(text_index['analyzer']['default'], 'keyword')
1454-
self.assertEquals(text_index['analyzer']['fields']['$default'], 'standard')
1455-
self.assertEquals(text_index['analyzer']['name'], 'perfield')
1456-
self.assertEquals(text_index['index']['default_analyzer'], 'keyword')
1457-
self.assertEquals(text_index['index']['default_field'], {})
1458-
self.assertEquals(text_index['index']['fields'], [{'name': 'name', 'type': 'string'}, {'name': 'age', 'type': 'number'}])
1459-
self.assertEquals(text_index['index']['selector'], {})
1453+
self.assertEqual(text_index['analyzer']['default'], 'keyword')
1454+
self.assertEqual(text_index['analyzer']['fields']['$default'], 'standard')
1455+
self.assertEqual(text_index['analyzer']['name'], 'perfield')
1456+
self.assertEqual(text_index['index']['default_analyzer'], 'keyword')
1457+
self.assertEqual(text_index['index']['default_field'], {})
1458+
self.assertEqual(text_index['index']['fields'], [{'name': 'name', 'type': 'string'}, {'name': 'age', 'type': 'number'}])
1459+
self.assertEqual(text_index['index']['selector'], {})
14601460
self.assertTrue(text_index['index']['index_array_lengths'])
14611461

14621462
def test_create_query_index_failure(self):
@@ -1513,28 +1513,28 @@ def test_get_query_indexes_raw(self):
15131513

15141514
indexes = self.db.get_query_indexes(raw_result=True)
15151515

1516-
self.assertEquals(indexes['total_rows'], 3)
1516+
self.assertEqual(indexes['total_rows'], 3)
15171517

15181518
all_docs_index = indexes['indexes'][0]
1519-
self.assertEquals(all_docs_index['ddoc'], None)
1520-
self.assertEquals(all_docs_index['def']['fields'], [{'_id': 'asc'}])
1521-
self.assertEquals(all_docs_index['name'], '_all_docs')
1522-
self.assertEquals(all_docs_index['type'], 'special')
1519+
self.assertEqual(all_docs_index['ddoc'], None)
1520+
self.assertEqual(all_docs_index['def']['fields'], [{'_id': 'asc'}])
1521+
self.assertEqual(all_docs_index['name'], '_all_docs')
1522+
self.assertEqual(all_docs_index['type'], 'special')
15231523

15241524
json_index = indexes['indexes'][1]
1525-
self.assertEquals(json_index['ddoc'], '_design/ddoc001')
1526-
self.assertEquals(json_index['def']['fields'], [{'name': 'asc'}, {'age': 'asc'}])
1527-
self.assertEquals(json_index['name'], 'json-idx-001')
1528-
self.assertEquals(json_index['type'], 'json')
1525+
self.assertEqual(json_index['ddoc'], '_design/ddoc001')
1526+
self.assertEqual(json_index['def']['fields'], [{'name': 'asc'}, {'age': 'asc'}])
1527+
self.assertEqual(json_index['name'], 'json-idx-001')
1528+
self.assertEqual(json_index['type'], 'json')
15291529

15301530
text_index = indexes['indexes'][2]
1531-
self.assertEquals(text_index['ddoc'], '_design/ddoc001')
1532-
self.assertEquals(text_index['def']['default_analyzer'], 'keyword')
1533-
self.assertEquals(text_index['def']['default_field'], {})
1534-
self.assertEquals(text_index['def']['fields'], [])
1535-
self.assertEquals(text_index['def']['selector'], {})
1536-
self.assertEquals(text_index['name'], 'text-idx-001')
1537-
self.assertEquals(text_index['type'], 'text')
1531+
self.assertEqual(text_index['ddoc'], '_design/ddoc001')
1532+
self.assertEqual(text_index['def']['default_analyzer'], 'keyword')
1533+
self.assertEqual(text_index['def']['default_field'], {})
1534+
self.assertEqual(text_index['def']['fields'], [])
1535+
self.assertEqual(text_index['def']['selector'], {})
1536+
self.assertEqual(text_index['name'], 'text-idx-001')
1537+
self.assertEqual(text_index['type'], 'text')
15381538
self.assertTrue(text_index['def']['index_array_lengths'])
15391539

15401540
def test_get_query_indexes(self):

‎tests/unit/design_document_tests.py

Copy file name to clipboardExpand all lines: tests/unit/design_document_tests.py
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -843,9 +843,9 @@ def test_get_search_info(self):
843843
# Validate the metadata
844844
search_index_metadata = search_info['search_index']
845845
self.assertIsNotNone(search_index_metadata)
846-
self.assertEquals(search_index_metadata['doc_del_count'], 0, 'There should be no deleted docs.')
846+
self.assertEqual(search_index_metadata['doc_del_count'], 0, 'There should be no deleted docs.')
847847
self.assertTrue(search_index_metadata['doc_count'] <= 100, 'There should be 100 or fewer docs.')
848-
self.assertEquals(search_index_metadata['committed_seq'], 0, 'The committed_seq should be 0.')
848+
self.assertEqual(search_index_metadata['committed_seq'], 0, 'The committed_seq should be 0.')
849849
self.assertTrue(search_index_metadata['pending_seq'] <= 101, 'The pending_seq should be 101 or fewer.')
850850
self.assertTrue(search_index_metadata['disk_size'] >0, 'The disk_size should be greater than 0.')
851851

@@ -1275,7 +1275,7 @@ def test_rewrite_rule(self):
12751275
doc = Document(self.db, 'rewrite_doc')
12761276
doc.save()
12771277
resp = self.client.r_session.get('/'.join([ddoc.document_url, '_rewrite']))
1278-
self.assertEquals(
1278+
self.assertEqual(
12791279
response_to_json_dict(resp),
12801280
{
12811281
'_id': 'rewrite_doc',

‎tests/unit/document_tests.py

Copy file name to clipboardExpand all lines: tests/unit/document_tests.py
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -944,14 +944,14 @@ def object_hook(self, obj):
944944

945945
raw_doc = self.db.all_docs(include_docs=True)['rows'][0]['doc']
946946

947-
self.assertEquals(raw_doc['name'], 'julia')
948-
self.assertEquals(raw_doc['dt']['_type'], 'datetime')
949-
self.assertEquals(raw_doc['dt']['value'], '2018-07-09T15:11:10')
947+
self.assertEqual(raw_doc['name'], 'julia')
948+
self.assertEqual(raw_doc['dt']['_type'], 'datetime')
949+
self.assertEqual(raw_doc['dt']['value'], '2018-07-09T15:11:10')
950950

951951
doc2 = Document(self.db, doc['_id'], decoder=DTDecoder)
952952
doc2.fetch()
953953

954-
self.assertEquals(doc2['dt'], doc['dt'])
954+
self.assertEqual(doc2['dt'], doc['dt'])
955955

956956
if __name__ == '__main__':
957957
unittest.main()

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.