Skip to content

Commit d178229

Browse files
OleLaursenOleLaursen
committed
assertEquals -> assertEqual in tests, the former is deprecated
 - Legacy-Id: 6964
1 parent 42ade62 commit d178229

21 files changed

Lines changed: 552 additions & 552 deletions

File tree

‎ietf/doc/tests.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -252,21 +252,21 @@ def test_add_comment(self):
252252

253253
# normal get
254254
r = self.client.get(url)
255-
self.assertEquals(r.status_code, 200)
255+
self.assertEqual(r.status_code, 200)
256256
q = PyQuery(r.content)
257-
self.assertEquals(len(q('form textarea[name=comment]')), 1)
257+
self.assertEqual(len(q('form textarea[name=comment]')), 1)
258258

259259
# request resurrect
260260
events_before = draft.docevent_set.count()
261261
mailbox_before = len(outbox)
262262

263263
r = self.client.post(url, dict(comment="This is a test."))
264-
self.assertEquals(r.status_code, 302)
264+
self.assertEqual(r.status_code, 302)
265265

266-
self.assertEquals(draft.docevent_set.count(), events_before + 1)
267-
self.assertEquals("This is a test.", draft.latest_event().desc)
268-
self.assertEquals("added_comment", draft.latest_event().type)
269-
self.assertEquals(len(outbox), mailbox_before + 1)
266+
self.assertEqual(draft.docevent_set.count(), events_before + 1)
267+
self.assertEqual("This is a test.", draft.latest_event().desc)
268+
self.assertEqual("added_comment", draft.latest_event().type)
269+
self.assertEqual(len(outbox), mailbox_before + 1)
270270
self.assertTrue("updated" in outbox[-1]['Subject'])
271271
self.assertTrue(draft.name in outbox[-1]['Subject'])
272272

@@ -275,9 +275,9 @@ def test_add_comment(self):
275275

276276
# normal get
277277
r = self.client.get(url)
278-
self.assertEquals(r.status_code, 200)
278+
self.assertEqual(r.status_code, 200)
279279
q = PyQuery(r.content)
280-
self.assertEquals(len(q('form textarea[name=comment]')), 1)
280+
self.assertEqual(len(q('form textarea[name=comment]')), 1)
281281

282282

283283
class TemplateTagTest(unittest.TestCase):

‎ietf/doc/tests_ballot.py‎

Lines changed: 66 additions & 66 deletions
Large diffs are not rendered by default.

‎ietf/doc/tests_conflict_review.py‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -32,40 +32,40 @@ def test_start_review(self):
3232

3333
# can't start conflict reviews on documents not in the ise or irtf streams
3434
r = self.client.get(url)
35-
self.assertEquals(r.status_code, 404)
35+
self.assertEqual(r.status_code, 404)
3636

3737
doc.stream=StreamName.objects.get(slug='ise')
3838
doc.save()
3939

4040
# normal get should succeed and get a reasonable form
4141
r = self.client.get(url)
42-
self.assertEquals(r.status_code, 200)
42+
self.assertEqual(r.status_code, 200)
4343
q = PyQuery(r.content)
44-
self.assertEquals(len(q('form select[name=create_in_state]')),1)
44+
self.assertEqual(len(q('form select[name=create_in_state]')),1)
4545

4646
# faulty posts
4747
r = self.client.post(url,dict(create_in_state=""))
48-
self.assertEquals(r.status_code, 200)
48+
self.assertEqual(r.status_code, 200)
4949
q = PyQuery(r.content)
5050
self.assertTrue(len(q('form ul.errorlist')) > 0)
51-
self.assertEquals(Document.objects.filter(name='conflict-review-imaginary-independent-submission').count() , 0)
51+
self.assertEqual(Document.objects.filter(name='conflict-review-imaginary-independent-submission').count() , 0)
5252

5353
r = self.client.post(url,dict(ad=""))
54-
self.assertEquals(r.status_code, 200)
54+
self.assertEqual(r.status_code, 200)
5555
q = PyQuery(r.content)
5656
self.assertTrue(len(q('form ul.errorlist')) > 0)
57-
self.assertEquals(Document.objects.filter(name='conflict-review-imaginary-independent-submission').count() , 0)
57+
self.assertEqual(Document.objects.filter(name='conflict-review-imaginary-independent-submission').count() , 0)
5858

5959
# successful review start
6060
ad_strpk = str(Person.objects.get(name='Aread Irector').pk)
6161
state_strpk = str(State.objects.get(used=True, slug='needshep',type__slug='conflrev').pk)
6262
r = self.client.post(url,dict(ad=ad_strpk,create_in_state=state_strpk,notify='ipu@ietf.org'))
63-
self.assertEquals(r.status_code, 302)
63+
self.assertEqual(r.status_code, 302)
6464
review_doc = Document.objects.get(name='conflict-review-imaginary-independent-submission')
65-
self.assertEquals(review_doc.get_state('conflrev').slug,'needshep')
66-
self.assertEquals(review_doc.rev,u'00')
67-
self.assertEquals(review_doc.ad.name,u'Aread Irector')
68-
self.assertEquals(review_doc.notify,u'ipu@ietf.org')
65+
self.assertEqual(review_doc.get_state('conflrev').slug,'needshep')
66+
self.assertEqual(review_doc.rev,u'00')
67+
self.assertEqual(review_doc.ad.name,u'Aread Irector')
68+
self.assertEqual(review_doc.notify,u'ipu@ietf.org')
6969
doc = Document.objects.get(name='draft-imaginary-independent-submission')
7070
self.assertTrue(doc in [x.target.document for x in review_doc.relateddocument_set.filter(relationship__slug='conflrev')])
7171

@@ -74,7 +74,7 @@ def test_start_review(self):
7474

7575
# verify you can't start a review when a review is already in progress
7676
r = self.client.post(url,dict(ad="Aread Irector",create_in_state="Needs Shepherd",notify='ipu@ietf.org'))
77-
self.assertEquals(r.status_code, 404)
77+
self.assertEqual(r.status_code, 404)
7878

7979
def test_change_state(self):
8080

@@ -85,34 +85,34 @@ def test_change_state(self):
8585

8686
# normal get
8787
r = self.client.get(url)
88-
self.assertEquals(r.status_code, 200)
88+
self.assertEqual(r.status_code, 200)
8989
q = PyQuery(r.content)
90-
self.assertEquals(len(q('form select[name=review_state]')),1)
90+
self.assertEqual(len(q('form select[name=review_state]')),1)
9191

9292
# faulty post
9393
r = self.client.post(url,dict(review_state=""))
94-
self.assertEquals(r.status_code, 200)
94+
self.assertEqual(r.status_code, 200)
9595
q = PyQuery(r.content)
9696
self.assertTrue(len(q('form ul.errorlist')) > 0)
9797

9898
# successful change to AD Review
9999
adrev_pk = str(State.objects.get(used=True, slug='adrev',type__slug='conflrev').pk)
100100
r = self.client.post(url,dict(review_state=adrev_pk,comment='RDNK84ZD'))
101-
self.assertEquals(r.status_code, 302)
101+
self.assertEqual(r.status_code, 302)
102102
review_doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
103-
self.assertEquals(review_doc.get_state('conflrev').slug,'adrev')
103+
self.assertEqual(review_doc.get_state('conflrev').slug,'adrev')
104104
self.assertTrue(review_doc.latest_event(DocEvent,type="added_comment").desc.startswith('RDNK84ZD'))
105105
self.assertFalse(review_doc.active_ballot())
106106

107107
# successful change to IESG Evaluation
108108
iesgeval_pk = str(State.objects.get(used=True, slug='iesgeval',type__slug='conflrev').pk)
109109
r = self.client.post(url,dict(review_state=iesgeval_pk,comment='TGmZtEjt'))
110-
self.assertEquals(r.status_code, 302)
110+
self.assertEqual(r.status_code, 302)
111111
review_doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
112-
self.assertEquals(review_doc.get_state('conflrev').slug,'iesgeval')
112+
self.assertEqual(review_doc.get_state('conflrev').slug,'iesgeval')
113113
self.assertTrue(review_doc.latest_event(DocEvent,type="added_comment").desc.startswith('TGmZtEjt'))
114114
self.assertTrue(review_doc.active_ballot())
115-
self.assertEquals(review_doc.latest_event(BallotPositionDocEvent, type="changed_ballot_position").pos_id,'yes')
115+
self.assertEqual(review_doc.latest_event(BallotPositionDocEvent, type="changed_ballot_position").pos_id,'yes')
116116

117117

118118
def test_edit_notices(self):
@@ -123,17 +123,17 @@ def test_edit_notices(self):
123123

124124
# normal get
125125
r = self.client.get(url)
126-
self.assertEquals(r.status_code, 200)
126+
self.assertEqual(r.status_code, 200)
127127
q = PyQuery(r.content)
128-
self.assertEquals(len(q('form input[name=notify]')),1)
129-
self.assertEquals(doc.notify,q('form input[name=notify]')[0].value)
128+
self.assertEqual(len(q('form input[name=notify]')),1)
129+
self.assertEqual(doc.notify,q('form input[name=notify]')[0].value)
130130

131131
# change notice list
132132
newlist = '"Foo Bar" <foo@bar.baz.com>'
133133
r = self.client.post(url,dict(notify=newlist))
134-
self.assertEquals(r.status_code,302)
134+
self.assertEqual(r.status_code,302)
135135
doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
136-
self.assertEquals(doc.notify,newlist)
136+
self.assertEqual(doc.notify,newlist)
137137
self.assertTrue(doc.latest_event(DocEvent,type="added_comment").desc.startswith('Notification list changed'))
138138

139139

@@ -145,16 +145,16 @@ def test_edit_ad(self):
145145

146146
# normal get
147147
r = self.client.get(url)
148-
self.assertEquals(r.status_code, 200)
148+
self.assertEqual(r.status_code, 200)
149149
q = PyQuery(r.content)
150-
self.assertEquals(len(q('select[name=ad]')),1)
150+
self.assertEqual(len(q('select[name=ad]')),1)
151151

152152
# change ads
153153
ad2 = Person.objects.get(name='Ad No2')
154154
r = self.client.post(url,dict(ad=str(ad2.pk)))
155-
self.assertEquals(r.status_code,302)
155+
self.assertEqual(r.status_code,302)
156156
doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
157-
self.assertEquals(doc.ad,ad2)
157+
self.assertEqual(doc.ad,ad2)
158158
self.assertTrue(doc.latest_event(DocEvent,type="added_comment").desc.startswith('Shepherding AD changed'))
159159

160160

@@ -166,41 +166,41 @@ def test_edit_telechat_date(self):
166166

167167
# normal get
168168
r = self.client.get(url)
169-
self.assertEquals(r.status_code, 200)
169+
self.assertEqual(r.status_code, 200)
170170
q = PyQuery(r.content)
171-
self.assertEquals(len(q('select[name=telechat_date]')),1)
171+
self.assertEqual(len(q('select[name=telechat_date]')),1)
172172

173173
# set a date
174174
self.assertFalse(doc.latest_event(TelechatDocEvent, "scheduled_for_telechat"))
175175
telechat_date = TelechatDate.objects.active().order_by('date')[0].date
176176
r = self.client.post(url,dict(telechat_date=telechat_date.isoformat()))
177-
self.assertEquals(r.status_code,302)
177+
self.assertEqual(r.status_code,302)
178178
doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
179-
self.assertEquals(doc.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date,telechat_date)
179+
self.assertEqual(doc.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date,telechat_date)
180180

181181
# move it forward a telechat (this should set the returning item bit)
182182
telechat_date = TelechatDate.objects.active().order_by('date')[1].date
183183
r = self.client.post(url,dict(telechat_date=telechat_date.isoformat()))
184-
self.assertEquals(r.status_code,302)
184+
self.assertEqual(r.status_code,302)
185185
doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
186186
self.assertTrue(doc.returning_item())
187187

188188
# clear the returning item bit
189189
r = self.client.post(url,dict(telechat_date=telechat_date.isoformat()))
190-
self.assertEquals(r.status_code,302)
190+
self.assertEqual(r.status_code,302)
191191
doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
192192
self.assertFalse(doc.returning_item())
193193

194194
# set the returning item bit without changing the date
195195
r = self.client.post(url,dict(telechat_date=telechat_date.isoformat(),returning_item="on"))
196-
self.assertEquals(r.status_code,302)
196+
self.assertEqual(r.status_code,302)
197197
doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
198198
self.assertTrue(doc.returning_item())
199199

200200
# Take the doc back off any telechat
201201
r = self.client.post(url,dict(telechat_date=""))
202-
self.assertEquals(r.status_code, 302)
203-
self.assertEquals(doc.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date,None)
202+
self.assertEqual(r.status_code, 302)
203+
self.assertEqual(doc.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date,None)
204204

205205
def approve_test_helper(self,approve_type):
206206

@@ -216,9 +216,9 @@ def approve_test_helper(self,approve_type):
216216

217217
# get
218218
r = self.client.get(url)
219-
self.assertEquals(r.status_code, 200)
219+
self.assertEqual(r.status_code, 200)
220220
q = PyQuery(r.content)
221-
self.assertEquals(len(q('form.approve')),1)
221+
self.assertEqual(len(q('form.approve')),1)
222222
if approve_type == 'appr-noprob':
223223
self.assertTrue( 'IESG has no problem' in ''.join(wrap(r.content,2**16)))
224224
else:
@@ -227,13 +227,13 @@ def approve_test_helper(self,approve_type):
227227
# submit
228228
messages_before = len(outbox)
229229
r = self.client.post(url,dict(announcement_text=default_approval_text(doc)))
230-
self.assertEquals(r.status_code, 302)
230+
self.assertEqual(r.status_code, 302)
231231

232232
doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
233-
self.assertEquals(doc.get_state_slug(),approve_type+'-sent')
233+
self.assertEqual(doc.get_state_slug(),approve_type+'-sent')
234234
self.assertFalse(doc.ballot_open("conflrev"))
235235

236-
self.assertEquals(len(outbox), messages_before + 1)
236+
self.assertEqual(len(outbox), messages_before + 1)
237237
self.assertTrue('Results of IETF-conflict review' in outbox[-1]['Subject'])
238238
if approve_type == 'appr-noprob':
239239
self.assertTrue( 'IESG has no problem' in ''.join(wrap(unicode(outbox[-1]),2**16)))
@@ -259,7 +259,7 @@ def test_initial_submission(self):
259259

260260
# normal get
261261
r = self.client.get(url)
262-
self.assertEquals(r.status_code,200)
262+
self.assertEqual(r.status_code,200)
263263
q = PyQuery(r.content)
264264
self.assertTrue(q('textarea[name="content"]')[0].text.strip().startswith("[Edit this page"))
265265

@@ -268,14 +268,14 @@ def test_initial_submission(self):
268268

269269
# sane post using textbox
270270
path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
271-
self.assertEquals(doc.rev,u'00')
271+
self.assertEqual(doc.rev,u'00')
272272
self.assertFalse(os.path.exists(path))
273273
r = self.client.post(url,dict(content="Some initial review text\n",submit_response="1"))
274-
self.assertEquals(r.status_code,302)
274+
self.assertEqual(r.status_code,302)
275275
doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
276-
self.assertEquals(doc.rev,u'00')
276+
self.assertEqual(doc.rev,u'00')
277277
with open(path) as f:
278-
self.assertEquals(f.read(),"Some initial review text\n")
278+
self.assertEqual(f.read(),"Some initial review text\n")
279279
f.close()
280280
self.assertTrue( "submission-00" in doc.latest_event(NewRevisionDocEvent).desc)
281281

@@ -286,15 +286,15 @@ def test_subsequent_submission(self):
286286

287287
# A little additional setup
288288
# doc.rev is u'00' per the test setup - double-checking that here - if it fails, the breakage is in setUp
289-
self.assertEquals(doc.rev,u'00')
289+
self.assertEqual(doc.rev,u'00')
290290
path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
291291
with open(path,'w') as f:
292292
f.write('This is the old proposal.')
293293
f.close()
294294

295295
# normal get
296296
r = self.client.get(url)
297-
self.assertEquals(r.status_code,200)
297+
self.assertEqual(r.status_code,200)
298298
q = PyQuery(r.content)
299299
self.assertTrue(q('textarea')[0].text.strip().startswith("This is the old proposal."))
300300

@@ -304,25 +304,25 @@ def test_subsequent_submission(self):
304304
test_file = StringIO("\x10\x11\x12") # post binary file
305305
test_file.name = "unnamed"
306306
r = self.client.post(url, dict(txt=test_file,submit_response="1"))
307-
self.assertEquals(r.status_code, 200)
307+
self.assertEqual(r.status_code, 200)
308308
self.assertTrue("does not appear to be a text file" in r.content)
309309

310310
# sane post uploading a file
311311
test_file = StringIO("This is a new proposal.")
312312
test_file.name = "unnamed"
313313
r = self.client.post(url,dict(txt=test_file,submit_response="1"))
314-
self.assertEquals(r.status_code, 302)
314+
self.assertEqual(r.status_code, 302)
315315
doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
316-
self.assertEquals(doc.rev,u'01')
316+
self.assertEqual(doc.rev,u'01')
317317
path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
318318
with open(path) as f:
319-
self.assertEquals(f.read(),"This is a new proposal.")
319+
self.assertEqual(f.read(),"This is a new proposal.")
320320
f.close()
321321
self.assertTrue( "submission-01" in doc.latest_event(NewRevisionDocEvent).desc)
322322

323323
# verify reset text button works
324324
r = self.client.post(url,dict(reset_text="1"))
325-
self.assertEquals(r.status_code, 200)
325+
self.assertEqual(r.status_code, 200)
326326
q = PyQuery(r.content)
327327
self.assertTrue(q('textarea')[0].text.strip().startswith("[Edit this page"))
328328

0 commit comments

Comments
 (0)