Skip to content

Commit e9f0507

Browse files
djcdjc
committed
Prefer assertEqual() over assertEquals() for forward compatibility.
1 parent 707a676 commit e9f0507

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

‎couchdb/tests/client.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,21 +82,21 @@ def test_replicate(self):
8282
bname, b = self.temp_db()
8383
id, rev = a.save({'test': 'a'})
8484
result = self.server.replicate(aname, bname)
85-
self.assertEquals(result['ok'], True)
86-
self.assertEquals(b[id]['test'], 'a')
85+
self.assertEqual(result['ok'], True)
86+
self.assertEqual(b[id]['test'], 'a')
8787

8888
doc = b[id]
8989
doc['test'] = 'b'
9090
b.update([doc])
9191
self.server.replicate(bname, aname)
92-
self.assertEquals(a[id]['test'], 'b')
93-
self.assertEquals(b[id]['test'], 'b')
92+
self.assertEqual(a[id]['test'], 'b')
93+
self.assertEqual(b[id]['test'], 'b')
9494

9595
def test_replicate_continuous(self):
9696
aname, a = self.temp_db()
9797
bname, b = self.temp_db()
9898
result = self.server.replicate(aname, bname, continuous=True)
99-
self.assertEquals(result['ok'], True)
99+
self.assertEqual(result['ok'], True)
100100
version = tuple(int(i) for i in self.server.version().split('.')[:2])
101101
if version >= (0, 10):
102102
self.assertTrue('_local_id' in result)
@@ -238,7 +238,7 @@ def test_attachment_crud(self):
238238
old_rev = doc['_rev']
239239

240240
self.db.put_attachment(doc, 'Foo bar', 'foo.txt', 'text/plain')
241-
self.assertNotEquals(old_rev, doc['_rev'])
241+
self.assertNotEqual(old_rev, doc['_rev'])
242242

243243
doc = self.db['foo']
244244
attachment = doc['_attachments']['foo.txt']
@@ -252,7 +252,7 @@ def test_attachment_crud(self):
252252

253253
old_rev = doc['_rev']
254254
self.db.delete_attachment(doc, 'foo.txt')
255-
self.assertNotEquals(old_rev, doc['_rev'])
255+
self.assertNotEqual(old_rev, doc['_rev'])
256256
self.assertEqual(None, self.db['foo'].get('_attachments'))
257257

258258
def test_attachment_crud_with_files(self):
@@ -262,7 +262,7 @@ def test_attachment_crud_with_files(self):
262262
fileobj = StringIO('Foo bar baz')
263263

264264
self.db.put_attachment(doc, fileobj, 'foo.txt')
265-
self.assertNotEquals(old_rev, doc['_rev'])
265+
self.assertNotEqual(old_rev, doc['_rev'])
266266

267267
doc = self.db['foo']
268268
attachment = doc['_attachments']['foo.txt']
@@ -276,7 +276,7 @@ def test_attachment_crud_with_files(self):
276276

277277
old_rev = doc['_rev']
278278
self.db.delete_attachment(doc, 'foo.txt')
279-
self.assertNotEquals(old_rev, doc['_rev'])
279+
self.assertNotEqual(old_rev, doc['_rev'])
280280
self.assertEqual(None, self.db['foo'].get('_attachments'))
281281

282282
def test_empty_attachment(self):
@@ -285,7 +285,7 @@ def test_empty_attachment(self):
285285
old_rev = doc['_rev']
286286

287287
self.db.put_attachment(doc, '', 'empty.txt')
288-
self.assertNotEquals(old_rev, doc['_rev'])
288+
self.assertNotEqual(old_rev, doc['_rev'])
289289

290290
doc = self.db['foo']
291291
attachment = doc['_attachments']['empty.txt']
@@ -320,7 +320,7 @@ def test_json_attachment(self):
320320
doc = {}
321321
self.db['foo'] = doc
322322
self.db.put_attachment(doc, '{}', 'test.json', 'application/json')
323-
self.assertEquals(self.db.get_attachment(doc, 'test.json').read(), '{}')
323+
self.assertEqual(self.db.get_attachment(doc, 'test.json').read(), '{}')
324324

325325
def test_include_docs(self):
326326
doc = {'foo': 42, 'bar': 40}
@@ -587,12 +587,12 @@ def reduce_fun(keys, values):
587587
def test_init_with_resource(self):
588588
self.db['foo'] = {}
589589
view = client.PermanentView(self.db.resource('_all_docs').url, '_all_docs')
590-
self.assertEquals(len(list(view())), 1)
590+
self.assertEqual(len(list(view())), 1)
591591

592592
def test_iter_view(self):
593593
self.db['foo'] = {}
594594
view = client.PermanentView(self.db.resource('_all_docs').url, '_all_docs')
595-
self.assertEquals(len(list(view)), 1)
595+
self.assertEqual(len(list(view)), 1)
596596

597597
def test_tmpview_repr(self):
598598
mapfunc = "function(doc) {emit(null, null);}"

‎couchdb/tests/http.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def test_timeout(self):
2525
start = time.time()
2626
status, headers, body = session.request('GET', db.resource.url + '/_changes?feed=longpoll&since=1000&timeout=%s' % (timeout*2*1000,))
2727
self.assertRaises(socket.timeout, body.read)
28-
self.failUnless(time.time() - start < timeout * 1.3)
28+
self.assertTrue(time.time() - start < timeout * 1.3)
2929

3030

3131
class ResponseBodyTestCase(unittest.TestCase):

‎couchdb/tests/mapping.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ class Thing(mapping.Document):
201201
self.assertEqual(thing.numbers[4], Decimal('4.0'))
202202
self.assertEqual(len(thing.numbers), 5)
203203
del thing.numbers[3:]
204-
self.assertEquals(len(thing.numbers), 3)
204+
self.assertEqual(len(thing.numbers), 3)
205205

206206
def test_mutable_fields(self):
207207
class Thing(mapping.Document):
@@ -231,24 +231,24 @@ def setUp(self):
231231
def test_viewfield_property(self):
232232
self.Item().store(self.db)
233233
results = self.Item.with_include_docs(self.db)
234-
self.assertEquals(type(results.rows[0]), self.Item)
234+
self.assertEqual(type(results.rows[0]), self.Item)
235235
results = self.Item.without_include_docs(self.db)
236-
self.assertEquals(type(results.rows[0]), self.Item)
236+
self.assertEqual(type(results.rows[0]), self.Item)
237237

238238
def test_view(self):
239239
self.Item().store(self.db)
240240
results = self.Item.view(self.db, 'test/without_include_docs')
241-
self.assertEquals(type(results.rows[0]), self.Item)
241+
self.assertEqual(type(results.rows[0]), self.Item)
242242
results = self.Item.view(self.db, 'test/without_include_docs',
243243
include_docs=True)
244-
self.assertEquals(type(results.rows[0]), self.Item)
244+
self.assertEqual(type(results.rows[0]), self.Item)
245245

246246
def test_query(self):
247247
self.Item().store(self.db)
248248
results = self.Item.query(self.db, all_map_func, None)
249-
self.assertEquals(type(results.rows[0]), self.Item)
249+
self.assertEqual(type(results.rows[0]), self.Item)
250250
results = self.Item.query(self.db, all_map_func, None, include_docs=True)
251-
self.assertEquals(type(results.rows[0]), self.Item)
251+
self.assertEqual(type(results.rows[0]), self.Item)
252252

253253

254254
def suite():

‎couchdb/tests/view.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ def test_reset(self):
1919
input = StringIO('["reset"]\n')
2020
output = StringIO()
2121
view.run(input=input, output=output)
22-
self.assertEquals(output.getvalue(), 'true\n')
22+
self.assertEqual(output.getvalue(), 'true\n')
2323

2424
def test_add_fun(self):
2525
input = StringIO('["add_fun", "def fun(doc): yield None, doc"]\n')
2626
output = StringIO()
2727
view.run(input=input, output=output)
28-
self.assertEquals(output.getvalue(), 'true\n')
28+
self.assertEqual(output.getvalue(), 'true\n')
2929

3030
def test_map_doc(self):
3131
input = StringIO('["add_fun", "def fun(doc): yield None, doc"]\n'

0 commit comments

Comments
 (0)