From d1782297ab1065565698fc5754cd87b775390d36 Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Tue, 17 Dec 2013 12:52:24 +0000 Subject: [PATCH] assertEquals -> assertEqual in tests, the former is deprecated - Legacy-Id: 6964 --- ietf/doc/tests.py | 18 +- ietf/doc/tests_ballot.py | 132 +++++++-------- ietf/doc/tests_conflict_review.py | 112 ++++++------- ietf/doc/tests_draft.py | 262 +++++++++++++++--------------- ietf/doc/tests_status_change.py | 148 ++++++++--------- ietf/iesg/tests.py | 62 +++---- ietf/message/tests.py | 6 +- ietf/secr/announcement/tests.py | 6 +- ietf/secr/areas/tests.py | 4 +- ietf/secr/drafts/tests.py | 4 +- ietf/secr/groups/tests.py | 10 +- ietf/secr/ipradmin/tests.py | 4 +- ietf/secr/meetings/tests.py | 4 +- ietf/secr/proceedings/tests.py | 4 +- ietf/secr/roles/tests.py | 2 +- ietf/secr/rolodex/tests.py | 4 +- ietf/secr/sreq/tests.py | 4 +- ietf/secr/telechat/tests.py | 4 +- ietf/sync/tests.py | 18 +- ietf/wgcharter/tests.py | 68 ++++---- ietf/wginfo/tests.py | 228 +++++++++++++------------- 21 files changed, 552 insertions(+), 552 deletions(-) diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py index 390588995..912ae1d47 100644 --- a/ietf/doc/tests.py +++ b/ietf/doc/tests.py @@ -252,21 +252,21 @@ class AddCommentTestCase(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form textarea[name=comment]')), 1) + self.assertEqual(len(q('form textarea[name=comment]')), 1) # request resurrect events_before = draft.docevent_set.count() mailbox_before = len(outbox) r = self.client.post(url, dict(comment="This is a test.")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) - self.assertEquals(draft.docevent_set.count(), events_before + 1) - self.assertEquals("This is a test.", draft.latest_event().desc) - self.assertEquals("added_comment", draft.latest_event().type) - self.assertEquals(len(outbox), mailbox_before + 1) + self.assertEqual(draft.docevent_set.count(), events_before + 1) + self.assertEqual("This is a test.", draft.latest_event().desc) + self.assertEqual("added_comment", draft.latest_event().type) + self.assertEqual(len(outbox), mailbox_before + 1) self.assertTrue("updated" in outbox[-1]['Subject']) self.assertTrue(draft.name in outbox[-1]['Subject']) @@ -275,9 +275,9 @@ class AddCommentTestCase(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form textarea[name=comment]')), 1) + self.assertEqual(len(q('form textarea[name=comment]')), 1) class TemplateTagTest(unittest.TestCase): diff --git a/ietf/doc/tests_ballot.py b/ietf/doc/tests_ballot.py index d39212cc7..9ce5aabbc 100644 --- a/ietf/doc/tests_ballot.py +++ b/ietf/doc/tests_ballot.py @@ -31,10 +31,10 @@ class EditPositionTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form input[name=position]')) > 0) - self.assertEquals(len(q('form textarea[name=comment]')), 1) + self.assertEqual(len(q('form textarea[name=comment]')), 1) # vote events_before = draft.docevent_set.count() @@ -42,45 +42,45 @@ class EditPositionTests(TestCase): r = self.client.post(url, dict(position="discuss", discuss=" This is a discussion test. \n ", comment=" This is a test. \n ")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) pos = draft.latest_event(BallotPositionDocEvent, ad=ad) - self.assertEquals(pos.pos.slug, "discuss") + self.assertEqual(pos.pos.slug, "discuss") self.assertTrue(" This is a discussion test." in pos.discuss) self.assertTrue(pos.discuss_time != None) self.assertTrue(" This is a test." in pos.comment) self.assertTrue(pos.comment_time != None) self.assertTrue("New position" in pos.desc) - self.assertEquals(draft.docevent_set.count(), events_before + 3) + self.assertEqual(draft.docevent_set.count(), events_before + 3) # recast vote events_before = draft.docevent_set.count() r = self.client.post(url, dict(position="noobj")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) pos = draft.latest_event(BallotPositionDocEvent, ad=ad) - self.assertEquals(pos.pos.slug, "noobj") - self.assertEquals(draft.docevent_set.count(), events_before + 1) + self.assertEqual(pos.pos.slug, "noobj") + self.assertEqual(draft.docevent_set.count(), events_before + 1) self.assertTrue("Position for" in pos.desc) # clear vote events_before = draft.docevent_set.count() r = self.client.post(url, dict(position="norecord")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) pos = draft.latest_event(BallotPositionDocEvent, ad=ad) - self.assertEquals(pos.pos.slug, "norecord") - self.assertEquals(draft.docevent_set.count(), events_before + 1) + self.assertEqual(pos.pos.slug, "norecord") + self.assertEqual(draft.docevent_set.count(), events_before + 1) self.assertTrue("Position for" in pos.desc) # change comment events_before = draft.docevent_set.count() r = self.client.post(url, dict(position="norecord", comment="New comment.")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) pos = draft.latest_event(BallotPositionDocEvent, ad=ad) - self.assertEquals(pos.pos.slug, "norecord") - self.assertEquals(draft.docevent_set.count(), events_before + 2) + self.assertEqual(pos.pos.slug, "norecord") + self.assertEqual(draft.docevent_set.count(), events_before + 2) self.assertTrue("Ballot comment text updated" in pos.desc) def test_edit_position_as_secretary(self): @@ -93,18 +93,18 @@ class EditPositionTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form input[name=position]')) > 0) # vote on behalf of AD events_before = draft.docevent_set.count() r = self.client.post(url, dict(position="discuss", discuss="Test discuss text")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) pos = draft.latest_event(BallotPositionDocEvent, ad=ad) - self.assertEquals(pos.pos.slug, "discuss") - self.assertEquals(pos.discuss, "Test discuss text") + self.assertEqual(pos.pos.slug, "discuss") + self.assertEqual(pos.discuss, "Test discuss text") self.assertTrue("New position" in pos.desc) self.assertTrue("by Sec" in pos.desc) @@ -123,7 +123,7 @@ class EditPositionTests(TestCase): # but not touch r = self.client.post(url, dict(position="discuss", discuss="Test discuss text")) - self.assertEquals(r.status_code, 403) + self.assertEqual(r.status_code, 403) def test_send_ballot_comment(self): draft = make_test_data() @@ -148,7 +148,7 @@ class EditPositionTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form input[name="cc"]')) > 0) @@ -156,9 +156,9 @@ class EditPositionTests(TestCase): mailbox_before = len(outbox) r = self.client.post(url, dict(cc="test@example.com", cc_state_change="1")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) - self.assertEquals(len(outbox), mailbox_before + 1) + self.assertEqual(len(outbox), mailbox_before + 1) m = outbox[-1] self.assertTrue("COMMENT" in m['Subject']) self.assertTrue("DISCUSS" in m['Subject']) @@ -177,18 +177,18 @@ class DeferBallotTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) # defer mailbox_before = len(outbox) r = self.client.post(url, dict()) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) draft = Document.objects.get(name=draft.name) - self.assertEquals(draft.get_state_slug("draft-iesg"), "defer") + self.assertEqual(draft.get_state_slug("draft-iesg"), "defer") - self.assertEquals(len(outbox), mailbox_before + 2) + self.assertEqual(len(outbox), mailbox_before + 2) self.assertTrue("State Update" in outbox[-2]['Subject']) self.assertTrue("Deferred" in outbox[-1]['Subject']) self.assertTrue(draft.file_tag() in outbox[-1]['Subject']) @@ -202,14 +202,14 @@ class DeferBallotTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) # undefer r = self.client.post(url, dict()) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) draft = Document.objects.get(name=draft.name) - self.assertEquals(draft.get_state_slug("draft-iesg"), "iesg-eva") + self.assertEqual(draft.get_state_slug("draft-iesg"), "iesg-eva") class BallotWriteupsTests(TestCase): @@ -220,18 +220,18 @@ class BallotWriteupsTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('textarea[name=last_call_text]')), 1) - self.assertEquals(len(q('input[type=submit][value*="Save Last Call"]')), 1) + self.assertEqual(len(q('textarea[name=last_call_text]')), 1) + self.assertEqual(len(q('input[type=submit][value*="Save Last Call"]')), 1) # we're secretariat, so we got The Link - self.assertEquals(len(q('a:contains("Make Last Call")')), 1) + self.assertEqual(len(q('a:contains("Make Last Call")')), 1) # subject error r = self.client.post(url, dict( last_call_text="Subject: test\r\nhello\r\n\r\n", save_last_call_text="1")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('ul.errorlist')) > 0) @@ -239,7 +239,7 @@ class BallotWriteupsTests(TestCase): r = self.client.post(url, dict( last_call_text="This is a simple test.", save_last_call_text="1")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) draft = Document.objects.get(name=draft.name) self.assertTrue("This is a simple test" in draft.latest_event(WriteupDocEvent, type="changed_last_call_text").text) @@ -247,7 +247,7 @@ class BallotWriteupsTests(TestCase): r = self.client.post(url, dict( last_call_text="This is a simple test.", regenerate_last_call_text="1")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) draft = Document.objects.get(name=draft.name) self.assertTrue("Subject: Last Call" in draft.latest_event(WriteupDocEvent, type="changed_last_call_text").text) @@ -260,7 +260,7 @@ class BallotWriteupsTests(TestCase): # give us an announcement to send r = self.client.post(url, dict(regenerate_last_call_text="1")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) mailbox_before = len(outbox) @@ -269,8 +269,8 @@ class BallotWriteupsTests(TestCase): last_call_text=draft.latest_event(WriteupDocEvent, type="changed_last_call_text").text, send_last_call_request="1")) draft = Document.objects.get(name=draft.name) - self.assertEquals(draft.get_state_slug("draft-iesg"), "lc-req") - self.assertEquals(len(outbox), mailbox_before + 3) + self.assertEqual(draft.get_state_slug("draft-iesg"), "lc-req") + self.assertEqual(len(outbox), mailbox_before + 3) self.assertTrue("Last Call" in outbox[-1]['Subject']) self.assertTrue(draft.name in outbox[-1]['Subject']) @@ -289,17 +289,17 @@ class BallotWriteupsTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('textarea[name=ballot_writeup]')), 1) - self.assertEquals(len(q('input[type=submit][value*="Save Ballot Writeup"]')), 1) + self.assertEqual(len(q('textarea[name=ballot_writeup]')), 1) + self.assertEqual(len(q('input[type=submit][value*="Save Ballot Writeup"]')), 1) self.assertTrue("IANA does not" in r.content) # save r = self.client.post(url, dict( ballot_writeup="This is a simple test.", save_ballot_writeup="1")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) draft = Document.objects.get(name=draft.name) self.assertTrue("This is a simple test" in draft.latest_event(WriteupDocEvent, type="changed_ballot_writeup_text").text) @@ -342,11 +342,11 @@ class BallotWriteupsTests(TestCase): r = self.client.post(url, dict( ballot_writeup="This is a test.", issue_ballot="1")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) draft = Document.objects.get(name=draft.name) self.assertTrue(draft.latest_event(type="sent_ballot_announcement")) - self.assertEquals(len(outbox), mailbox_before + 2) + self.assertEqual(len(outbox), mailbox_before + 2) issue_email = outbox[-2] self.assertTrue("Evaluation:" in issue_email['Subject']) self.assertTrue("comment1" not in str(issue_email)) @@ -363,22 +363,22 @@ class BallotWriteupsTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('textarea[name=approval_text]')), 1) - self.assertEquals(len(q('input[type=submit][value*="Save Approval"]')), 1) + self.assertEqual(len(q('textarea[name=approval_text]')), 1) + self.assertEqual(len(q('input[type=submit][value*="Save Approval"]')), 1) # save r = self.client.post(url, dict( approval_text="This is a simple test.", save_approval_text="1")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) draft = Document.objects.get(name=draft.name) self.assertTrue("This is a simple test" in draft.latest_event(WriteupDocEvent, type="changed_ballot_approval_text").text) # test regenerate r = self.client.post(url, dict(regenerate_approval_text="1")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) draft = Document.objects.get(name=draft.name) self.assertTrue("Subject: Protocol Action" in draft.latest_event(WriteupDocEvent, type="changed_ballot_approval_text").text) @@ -386,7 +386,7 @@ class BallotWriteupsTests(TestCase): draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="nopubadw")) r = self.client.post(url, dict(regenerate_approval_text="1")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) draft = Document.objects.get(name=draft.name) self.assertTrue("NOT be published" in draft.latest_event(WriteupDocEvent, type="changed_ballot_approval_text").text) @@ -397,7 +397,7 @@ class BallotWriteupsTests(TestCase): draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="iesg-eva")) r = self.client.post(url, dict(regenerate_approval_text="1")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) draft = Document.objects.get(name=draft.name) self.assertTrue("Subject: Results of IETF-conflict review" in draft.latest_event(WriteupDocEvent, type="changed_ballot_approval_text").text) @@ -412,20 +412,20 @@ class ApproveBallotTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue("send out the announcement" in q('.actions input[type=submit]')[0].get('value').lower()) - self.assertEquals(len(q('.announcement pre:contains("Subject: Protocol Action")')), 1) + self.assertEqual(len(q('.announcement pre:contains("Subject: Protocol Action")')), 1) # approve mailbox_before = len(outbox) r = self.client.post(url, dict(skiprfceditorpost="1")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) draft = Document.objects.get(name=draft.name) - self.assertEquals(draft.get_state_slug("draft-iesg"), "ann") - self.assertEquals(len(outbox), mailbox_before + 4) + self.assertEqual(draft.get_state_slug("draft-iesg"), "ann") + self.assertEqual(len(outbox), mailbox_before + 4) self.assertTrue("Protocol Action" in outbox[-2]['Subject']) # the IANA copy self.assertTrue("Protocol Action" in outbox[-1]['Subject']) @@ -443,11 +443,11 @@ class ApproveBallotTests(TestCase): mailbox_before = len(outbox) r = self.client.post(url, dict()) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) draft = Document.objects.get(name=draft.name) - self.assertEquals(draft.get_state_slug("draft-iesg"), "dead") - self.assertEquals(len(outbox), mailbox_before + 3) + self.assertEqual(draft.get_state_slug("draft-iesg"), "dead") + self.assertEqual(len(outbox), mailbox_before + 3) self.assertTrue("NOT be published" in str(outbox[-1])) @@ -461,9 +461,9 @@ class MakeLastCallTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('input[name=last_call_sent_date]')), 1) + self.assertEqual(len(q('input[name=last_call_sent_date]')), 1) # make last call mailbox_before = len(outbox) @@ -474,12 +474,12 @@ class MakeLastCallTests(TestCase): dict(last_call_sent_date=q('input[name=last_call_sent_date]')[0].get("value"), last_call_expiration_date=expire_date )) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) draft = Document.objects.get(name=draft.name) - self.assertEquals(draft.get_state_slug("draft-iesg"), "lc") - self.assertEquals(draft.latest_event(LastCallDocEvent, "sent_last_call").expires.strftime("%Y-%m-%d"), expire_date) - self.assertEquals(len(outbox), mailbox_before + 4) + self.assertEqual(draft.get_state_slug("draft-iesg"), "lc") + self.assertEqual(draft.latest_event(LastCallDocEvent, "sent_last_call").expires.strftime("%Y-%m-%d"), expire_date) + self.assertEqual(len(outbox), mailbox_before + 4) self.assertTrue("Last Call" in outbox[-4]['Subject']) # the IANA copy diff --git a/ietf/doc/tests_conflict_review.py b/ietf/doc/tests_conflict_review.py index 0f87c0807..595cf9549 100644 --- a/ietf/doc/tests_conflict_review.py +++ b/ietf/doc/tests_conflict_review.py @@ -32,40 +32,40 @@ class ConflictReviewTests(TestCase): # can't start conflict reviews on documents not in the ise or irtf streams r = self.client.get(url) - self.assertEquals(r.status_code, 404) + self.assertEqual(r.status_code, 404) doc.stream=StreamName.objects.get(slug='ise') doc.save() # normal get should succeed and get a reasonable form r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form select[name=create_in_state]')),1) + self.assertEqual(len(q('form select[name=create_in_state]')),1) # faulty posts r = self.client.post(url,dict(create_in_state="")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) - self.assertEquals(Document.objects.filter(name='conflict-review-imaginary-independent-submission').count() , 0) + self.assertEqual(Document.objects.filter(name='conflict-review-imaginary-independent-submission').count() , 0) r = self.client.post(url,dict(ad="")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) - self.assertEquals(Document.objects.filter(name='conflict-review-imaginary-independent-submission').count() , 0) + self.assertEqual(Document.objects.filter(name='conflict-review-imaginary-independent-submission').count() , 0) # successful review start ad_strpk = str(Person.objects.get(name='Aread Irector').pk) state_strpk = str(State.objects.get(used=True, slug='needshep',type__slug='conflrev').pk) r = self.client.post(url,dict(ad=ad_strpk,create_in_state=state_strpk,notify='ipu@ietf.org')) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) review_doc = Document.objects.get(name='conflict-review-imaginary-independent-submission') - self.assertEquals(review_doc.get_state('conflrev').slug,'needshep') - self.assertEquals(review_doc.rev,u'00') - self.assertEquals(review_doc.ad.name,u'Aread Irector') - self.assertEquals(review_doc.notify,u'ipu@ietf.org') + self.assertEqual(review_doc.get_state('conflrev').slug,'needshep') + self.assertEqual(review_doc.rev,u'00') + self.assertEqual(review_doc.ad.name,u'Aread Irector') + self.assertEqual(review_doc.notify,u'ipu@ietf.org') doc = Document.objects.get(name='draft-imaginary-independent-submission') self.assertTrue(doc in [x.target.document for x in review_doc.relateddocument_set.filter(relationship__slug='conflrev')]) @@ -74,7 +74,7 @@ class ConflictReviewTests(TestCase): # verify you can't start a review when a review is already in progress r = self.client.post(url,dict(ad="Aread Irector",create_in_state="Needs Shepherd",notify='ipu@ietf.org')) - self.assertEquals(r.status_code, 404) + self.assertEqual(r.status_code, 404) def test_change_state(self): @@ -85,34 +85,34 @@ class ConflictReviewTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form select[name=review_state]')),1) + self.assertEqual(len(q('form select[name=review_state]')),1) # faulty post r = self.client.post(url,dict(review_state="")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) # successful change to AD Review adrev_pk = str(State.objects.get(used=True, slug='adrev',type__slug='conflrev').pk) r = self.client.post(url,dict(review_state=adrev_pk,comment='RDNK84ZD')) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) review_doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') - self.assertEquals(review_doc.get_state('conflrev').slug,'adrev') + self.assertEqual(review_doc.get_state('conflrev').slug,'adrev') self.assertTrue(review_doc.latest_event(DocEvent,type="added_comment").desc.startswith('RDNK84ZD')) self.assertFalse(review_doc.active_ballot()) # successful change to IESG Evaluation iesgeval_pk = str(State.objects.get(used=True, slug='iesgeval',type__slug='conflrev').pk) r = self.client.post(url,dict(review_state=iesgeval_pk,comment='TGmZtEjt')) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) review_doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') - self.assertEquals(review_doc.get_state('conflrev').slug,'iesgeval') + self.assertEqual(review_doc.get_state('conflrev').slug,'iesgeval') self.assertTrue(review_doc.latest_event(DocEvent,type="added_comment").desc.startswith('TGmZtEjt')) self.assertTrue(review_doc.active_ballot()) - self.assertEquals(review_doc.latest_event(BallotPositionDocEvent, type="changed_ballot_position").pos_id,'yes') + self.assertEqual(review_doc.latest_event(BallotPositionDocEvent, type="changed_ballot_position").pos_id,'yes') def test_edit_notices(self): @@ -123,17 +123,17 @@ class ConflictReviewTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form input[name=notify]')),1) - self.assertEquals(doc.notify,q('form input[name=notify]')[0].value) + self.assertEqual(len(q('form input[name=notify]')),1) + self.assertEqual(doc.notify,q('form input[name=notify]')[0].value) # change notice list newlist = '"Foo Bar" ' r = self.client.post(url,dict(notify=newlist)) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') - self.assertEquals(doc.notify,newlist) + self.assertEqual(doc.notify,newlist) self.assertTrue(doc.latest_event(DocEvent,type="added_comment").desc.startswith('Notification list changed')) @@ -145,16 +145,16 @@ class ConflictReviewTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('select[name=ad]')),1) + self.assertEqual(len(q('select[name=ad]')),1) # change ads ad2 = Person.objects.get(name='Ad No2') r = self.client.post(url,dict(ad=str(ad2.pk))) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') - self.assertEquals(doc.ad,ad2) + self.assertEqual(doc.ad,ad2) self.assertTrue(doc.latest_event(DocEvent,type="added_comment").desc.startswith('Shepherding AD changed')) @@ -166,41 +166,41 @@ class ConflictReviewTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('select[name=telechat_date]')),1) + self.assertEqual(len(q('select[name=telechat_date]')),1) # set a date self.assertFalse(doc.latest_event(TelechatDocEvent, "scheduled_for_telechat")) telechat_date = TelechatDate.objects.active().order_by('date')[0].date r = self.client.post(url,dict(telechat_date=telechat_date.isoformat())) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') - self.assertEquals(doc.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date,telechat_date) + self.assertEqual(doc.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date,telechat_date) # move it forward a telechat (this should set the returning item bit) telechat_date = TelechatDate.objects.active().order_by('date')[1].date r = self.client.post(url,dict(telechat_date=telechat_date.isoformat())) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') self.assertTrue(doc.returning_item()) # clear the returning item bit r = self.client.post(url,dict(telechat_date=telechat_date.isoformat())) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') self.assertFalse(doc.returning_item()) # set the returning item bit without changing the date r = self.client.post(url,dict(telechat_date=telechat_date.isoformat(),returning_item="on")) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') self.assertTrue(doc.returning_item()) # Take the doc back off any telechat r = self.client.post(url,dict(telechat_date="")) - self.assertEquals(r.status_code, 302) - self.assertEquals(doc.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date,None) + self.assertEqual(r.status_code, 302) + self.assertEqual(doc.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date,None) def approve_test_helper(self,approve_type): @@ -216,9 +216,9 @@ class ConflictReviewTests(TestCase): # get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form.approve')),1) + self.assertEqual(len(q('form.approve')),1) if approve_type == 'appr-noprob': self.assertTrue( 'IESG has no problem' in ''.join(wrap(r.content,2**16))) else: @@ -227,13 +227,13 @@ class ConflictReviewTests(TestCase): # submit messages_before = len(outbox) r = self.client.post(url,dict(announcement_text=default_approval_text(doc))) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') - self.assertEquals(doc.get_state_slug(),approve_type+'-sent') + self.assertEqual(doc.get_state_slug(),approve_type+'-sent') self.assertFalse(doc.ballot_open("conflrev")) - self.assertEquals(len(outbox), messages_before + 1) + self.assertEqual(len(outbox), messages_before + 1) self.assertTrue('Results of IETF-conflict review' in outbox[-1]['Subject']) if approve_type == 'appr-noprob': self.assertTrue( 'IESG has no problem' in ''.join(wrap(unicode(outbox[-1]),2**16))) @@ -259,7 +259,7 @@ class ConflictReviewSubmitTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code,200) + self.assertEqual(r.status_code,200) q = PyQuery(r.content) self.assertTrue(q('textarea[name="content"]')[0].text.strip().startswith("[Edit this page")) @@ -268,14 +268,14 @@ class ConflictReviewSubmitTests(TestCase): # sane post using textbox path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev)) - self.assertEquals(doc.rev,u'00') + self.assertEqual(doc.rev,u'00') self.assertFalse(os.path.exists(path)) r = self.client.post(url,dict(content="Some initial review text\n",submit_response="1")) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') - self.assertEquals(doc.rev,u'00') + self.assertEqual(doc.rev,u'00') with open(path) as f: - self.assertEquals(f.read(),"Some initial review text\n") + self.assertEqual(f.read(),"Some initial review text\n") f.close() self.assertTrue( "submission-00" in doc.latest_event(NewRevisionDocEvent).desc) @@ -286,7 +286,7 @@ class ConflictReviewSubmitTests(TestCase): # A little additional setup # doc.rev is u'00' per the test setup - double-checking that here - if it fails, the breakage is in setUp - self.assertEquals(doc.rev,u'00') + self.assertEqual(doc.rev,u'00') path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev)) with open(path,'w') as f: f.write('This is the old proposal.') @@ -294,7 +294,7 @@ class ConflictReviewSubmitTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code,200) + self.assertEqual(r.status_code,200) q = PyQuery(r.content) self.assertTrue(q('textarea')[0].text.strip().startswith("This is the old proposal.")) @@ -304,25 +304,25 @@ class ConflictReviewSubmitTests(TestCase): test_file = StringIO("\x10\x11\x12") # post binary file test_file.name = "unnamed" r = self.client.post(url, dict(txt=test_file,submit_response="1")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) self.assertTrue("does not appear to be a text file" in r.content) # sane post uploading a file test_file = StringIO("This is a new proposal.") test_file.name = "unnamed" r = self.client.post(url,dict(txt=test_file,submit_response="1")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') - self.assertEquals(doc.rev,u'01') + self.assertEqual(doc.rev,u'01') path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev)) with open(path) as f: - self.assertEquals(f.read(),"This is a new proposal.") + self.assertEqual(f.read(),"This is a new proposal.") f.close() self.assertTrue( "submission-01" in doc.latest_event(NewRevisionDocEvent).desc) # verify reset text button works r = self.client.post(url,dict(reset_text="1")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(q('textarea')[0].text.strip().startswith("[Edit this page")) diff --git a/ietf/doc/tests_draft.py b/ietf/doc/tests_draft.py index 60d0e433a..5ff5970e7 100644 --- a/ietf/doc/tests_draft.py +++ b/ietf/doc/tests_draft.py @@ -33,9 +33,9 @@ class ChangeStateTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form select[name=state]')), 1) + self.assertEqual(len(q('form select[name=state]')), 1) if next_states: self.assertTrue(len(q('.next-states form input[type=hidden]')) > 0) @@ -43,11 +43,11 @@ class ChangeStateTests(TestCase): # faulty post r = self.client.post(url, dict(state=State.objects.get(used=True, type="draft", slug="active").pk)) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) draft = Document.objects.get(name=draft.name) - self.assertEquals(draft.get_state("draft-iesg"), first_state) + self.assertEqual(draft.get_state("draft-iesg"), first_state) # change state @@ -59,25 +59,25 @@ class ChangeStateTests(TestCase): dict(state=State.objects.get(used=True, type="draft-iesg", slug="review-e").pk, substate="point", comment="Test comment")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) draft = Document.objects.get(name=draft.name) - self.assertEquals(draft.get_state_slug("draft-iesg"), "review-e") + self.assertEqual(draft.get_state_slug("draft-iesg"), "review-e") self.assertTrue(not draft.tags.filter(slug="ad-f-up")) self.assertTrue(draft.tags.filter(slug="point")) - self.assertEquals(draft.docevent_set.count(), events_before + 2) + self.assertEqual(draft.docevent_set.count(), events_before + 2) self.assertTrue("Test comment" in draft.docevent_set.all()[0].desc) self.assertTrue("State changed" in draft.docevent_set.all()[1].desc) - self.assertEquals(len(outbox), mailbox_before + 2) + self.assertEqual(len(outbox), mailbox_before + 2) self.assertTrue("State Update Notice" in outbox[-2]['Subject']) self.assertTrue(draft.name in outbox[-1]['Subject']) # check that we got a previous state now r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('.prev-state form input[name="state"]')), 1) + self.assertEqual(len(q('.prev-state form input[name="state"]')), 1) def test_pull_from_rfc_queue(self): draft = make_test_data() @@ -93,11 +93,11 @@ class ChangeStateTests(TestCase): dict(state=State.objects.get(used=True, type="draft-iesg", slug="review-e").pk, substate="", comment="Test comment")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) draft = Document.objects.get(name=draft.name) - self.assertEquals(draft.get_state_slug("draft-iesg"), "review-e") - self.assertEquals(len(outbox), mailbox_before + 2 + 1) + self.assertEqual(draft.get_state_slug("draft-iesg"), "review-e") + self.assertEqual(len(outbox), mailbox_before + 2 + 1) self.assertTrue(draft.name in outbox[-1]['Subject']) self.assertTrue("changed state" in outbox[-1]['Subject']) self.assertTrue("is no longer" in str(outbox[-1])) @@ -115,24 +115,24 @@ class ChangeStateTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form select[name=state]')), 1) + self.assertEqual(len(q('form select[name=state]')), 1) # faulty post r = self.client.post(url, dict(state="foobarbaz")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) draft = Document.objects.get(name=draft.name) - self.assertEquals(draft.get_state("draft-iana-review"), first_state) + self.assertEqual(draft.get_state("draft-iana-review"), first_state) # change state r = self.client.post(url, dict(state=next_state.pk)) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) draft = Document.objects.get(name=draft.name) - self.assertEquals(draft.get_state("draft-iana-review"), next_state) + self.assertEqual(draft.get_state("draft-iana-review"), next_state) def test_request_last_call(self): draft = make_test_data() @@ -182,18 +182,18 @@ class EditInfoTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form select[name=intended_std_level]')), 1) + self.assertEqual(len(q('form select[name=intended_std_level]')), 1) prev_ad = draft.ad # faulty post r = self.client.post(url, dict(ad="123456789")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) draft = Document.objects.get(name=draft.name) - self.assertEquals(draft.ad, prev_ad) + self.assertEqual(draft.ad, prev_ad) # edit info events_before = draft.docevent_set.count() @@ -209,14 +209,14 @@ class EditInfoTests(TestCase): note="New note", telechat_date="", )) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) draft = Document.objects.get(name=draft.name) - self.assertEquals(draft.ad, new_ad) - self.assertEquals(draft.note, "New note") + self.assertEqual(draft.ad, new_ad) + self.assertEqual(draft.note, "New note") self.assertTrue(not draft.latest_event(TelechatDocEvent, type="scheduled_for_telechat")) - self.assertEquals(draft.docevent_set.count(), events_before + 3) - self.assertEquals(len(outbox), mailbox_before + 1) + self.assertEqual(draft.docevent_set.count(), events_before + 3) + self.assertEqual(len(outbox), mailbox_before + 1) self.assertTrue(draft.name in outbox[-1]['Subject']) def test_edit_telechat_date(self): @@ -236,7 +236,7 @@ class EditInfoTests(TestCase): self.assertTrue(not draft.latest_event(TelechatDocEvent, type="scheduled_for_telechat")) data["telechat_date"] = TelechatDate.objects.active()[0].date.isoformat() r = self.client.post(url, data) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) draft = Document.objects.get(name=draft.name) self.assertTrue(draft.latest_event(TelechatDocEvent, type="scheduled_for_telechat")) @@ -245,7 +245,7 @@ class EditInfoTests(TestCase): # change telechat data["telechat_date"] = TelechatDate.objects.active()[1].date.isoformat() r = self.client.post(url, data) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) draft = Document.objects.get(name=draft.name) self.assertEqual(draft.latest_event(TelechatDocEvent, type="scheduled_for_telechat").telechat_date, TelechatDate.objects.active()[1].date) @@ -253,7 +253,7 @@ class EditInfoTests(TestCase): # remove from agenda data["telechat_date"] = "" r = self.client.post(url, data) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) draft = Document.objects.get(name=draft.name) self.assertTrue(not draft.latest_event(TelechatDocEvent, type="scheduled_for_telechat").telechat_date) @@ -292,9 +292,9 @@ class EditInfoTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form select[name=intended_std_level]')), 1) + self.assertEqual(len(q('form select[name=intended_std_level]')), 1) self.assertTrue('@' in q('form input[name=notify]')[0].get('value')) # add @@ -311,17 +311,17 @@ class EditInfoTests(TestCase): note="This is a note", telechat_date="", )) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) draft = Document.objects.get(name=draft.name) - self.assertEquals(draft.get_state_slug("draft-iesg"), "watching") - self.assertEquals(draft.ad, ad) - self.assertEquals(draft.note, "This is a note") + self.assertEqual(draft.get_state_slug("draft-iesg"), "watching") + self.assertEqual(draft.ad, ad) + self.assertEqual(draft.note, "This is a note") self.assertTrue(not draft.latest_event(TelechatDocEvent, type="scheduled_for_telechat")) - self.assertEquals(draft.docevent_set.count(), events_before + 3) + self.assertEqual(draft.docevent_set.count(), events_before + 3) events = list(draft.docevent_set.order_by('time', 'id')) - self.assertEquals(events[-3].type, "started_iesg_process") - self.assertEquals(len(outbox), mailbox_before) + self.assertEqual(events[-3].type, "started_iesg_process") + self.assertEqual(len(outbox), mailbox_before) # Redo, starting in publication requested to make sure WG state is also set draft.unset_state('draft-iesg') @@ -336,10 +336,10 @@ class EditInfoTests(TestCase): note="This is a note", telechat_date="", )) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) draft = Document.objects.get(name=draft.name) - self.assertEquals(draft.get_state_slug('draft-iesg'),'pub-req') - self.assertEquals(draft.get_state_slug('draft-stream-ietf'),'sub-pub') + self.assertEqual(draft.get_state_slug('draft-iesg'),'pub-req') + self.assertEqual(draft.get_state_slug('draft-stream-ietf'),'sub-pub') def test_edit_consensus(self): draft = make_test_data() @@ -349,7 +349,7 @@ class EditInfoTests(TestCase): self.assertTrue(not draft.latest_event(ConsensusDocEvent, type="changed_consensus")) r = self.client.post(url, dict(consensus="Yes")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) self.assertEqual(draft.latest_event(ConsensusDocEvent, type="changed_consensus").consensus, True) @@ -365,9 +365,9 @@ class ResurrectTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form input[type=submit]')), 1) + self.assertEqual(len(q('form input[type=submit]')), 1) # request resurrect @@ -375,15 +375,15 @@ class ResurrectTests(TestCase): mailbox_before = len(outbox) r = self.client.post(url, dict()) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) draft = Document.objects.get(name=draft.name) - self.assertEquals(draft.docevent_set.count(), events_before + 1) + self.assertEqual(draft.docevent_set.count(), events_before + 1) e = draft.latest_event(type="requested_resurrect") self.assertTrue(e) - self.assertEquals(e.by, Person.objects.get(name="Aread Irector")) + self.assertEqual(e.by, Person.objects.get(name="Aread Irector")) self.assertTrue("Resurrection" in e.desc) - self.assertEquals(len(outbox), mailbox_before + 1) + self.assertEqual(len(outbox), mailbox_before + 1) self.assertTrue("Resurrection" in outbox[-1]['Subject']) def test_resurrect(self): @@ -400,23 +400,23 @@ class ResurrectTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form input[type=submit]')), 1) + self.assertEqual(len(q('form input[type=submit]')), 1) # complete resurrect events_before = draft.docevent_set.count() mailbox_before = len(outbox) r = self.client.post(url, dict()) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) draft = Document.objects.get(name=draft.name) - self.assertEquals(draft.docevent_set.count(), events_before + 1) - self.assertEquals(draft.latest_event().type, "completed_resurrect") - self.assertEquals(draft.get_state_slug(), "active") + self.assertEqual(draft.docevent_set.count(), events_before + 1) + self.assertEqual(draft.latest_event().type, "completed_resurrect") + self.assertEqual(draft.get_state_slug(), "active") self.assertTrue(draft.expires >= datetime.datetime.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE - 1)) - self.assertEquals(len(outbox), mailbox_before + 1) + self.assertEqual(len(outbox), mailbox_before + 1) class ExpireIDsTests(TestCase): @@ -461,21 +461,21 @@ class ExpireIDsTests(TestCase): draft = make_test_data() - self.assertEquals(len(list(get_soon_to_expire_drafts(14))), 0) + self.assertEqual(len(list(get_soon_to_expire_drafts(14))), 0) # hack into expirable state draft.unset_state("draft-iesg") draft.expires = datetime.datetime.now() + datetime.timedelta(days=10) draft.save() - self.assertEquals(len(list(get_soon_to_expire_drafts(14))), 1) + self.assertEqual(len(list(get_soon_to_expire_drafts(14))), 1) # test send warning mailbox_before = len(outbox) send_expire_warning_for_draft(draft) - self.assertEquals(len(outbox), mailbox_before + 1) + self.assertEqual(len(outbox), mailbox_before + 1) self.assertTrue("aread@ietf.org" in str(outbox[-1])) # author self.assertTrue("wgchairman@ietf.org" in str(outbox[-1])) @@ -484,29 +484,29 @@ class ExpireIDsTests(TestCase): draft = make_test_data() - self.assertEquals(len(list(get_expired_drafts())), 0) + self.assertEqual(len(list(get_expired_drafts())), 0) # hack into expirable state draft.unset_state("draft-iesg") draft.expires = datetime.datetime.now() draft.save() - self.assertEquals(len(list(get_expired_drafts())), 1) + self.assertEqual(len(list(get_expired_drafts())), 1) draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="watching")) - self.assertEquals(len(list(get_expired_drafts())), 1) + self.assertEqual(len(list(get_expired_drafts())), 1) draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="iesg-eva")) - self.assertEquals(len(list(get_expired_drafts())), 0) + self.assertEqual(len(list(get_expired_drafts())), 0) # test notice mailbox_before = len(outbox) send_expire_notice_for_draft(draft) - self.assertEquals(len(outbox), mailbox_before + 1) + self.assertEqual(len(outbox), mailbox_before + 1) self.assertTrue("expired" in outbox[-1]["Subject"]) # test expiry @@ -516,8 +516,8 @@ class ExpireIDsTests(TestCase): expire_draft(draft) draft = Document.objects.get(name=draft.name) - self.assertEquals(draft.get_state_slug(), "expired") - self.assertEquals(draft.get_state_slug("draft-iesg"), "dead") + self.assertEqual(draft.get_state_slug(), "expired") + self.assertEqual(draft.get_state_slug("draft-iesg"), "dead") self.assertTrue(draft.latest_event(type="expired_document")) self.assertTrue(not os.path.exists(os.path.join(self.id_dir, txt))) self.assertTrue(os.path.exists(os.path.join(self.archive_dir, txt))) @@ -611,7 +611,7 @@ class ExpireLastCallTests(TestCase): secretary = Person.objects.get(name="Sec Retary") - self.assertEquals(len(list(get_expired_last_calls())), 0) + self.assertEqual(len(list(get_expired_last_calls())), 0) e = LastCallDocEvent() e.doc = draft @@ -621,7 +621,7 @@ class ExpireLastCallTests(TestCase): e.expires = datetime.datetime.now() + datetime.timedelta(days=14) e.save() - self.assertEquals(len(list(get_expired_last_calls())), 0) + self.assertEqual(len(list(get_expired_last_calls())), 0) # test expired e = LastCallDocEvent() @@ -633,7 +633,7 @@ class ExpireLastCallTests(TestCase): e.save() drafts = list(get_expired_last_calls()) - self.assertEquals(len(drafts), 1) + self.assertEqual(len(drafts), 1) # expire it mailbox_before = len(outbox) @@ -642,9 +642,9 @@ class ExpireLastCallTests(TestCase): expire_last_call(drafts[0]) draft = Document.objects.get(name=draft.name) - self.assertEquals(draft.get_state_slug("draft-iesg"), "writeupw") - self.assertEquals(draft.docevent_set.count(), events_before + 1) - self.assertEquals(len(outbox), mailbox_before + 1) + self.assertEqual(draft.get_state_slug("draft-iesg"), "writeupw") + self.assertEqual(draft.docevent_set.count(), events_before + 1) + self.assertEqual(len(outbox), mailbox_before + 1) self.assertTrue("Last Call Expired" in outbox[-1]["Subject"]) @@ -655,17 +655,17 @@ class IndividualInfoFormsTests(TestCase): # get r = self.client.get(url) - self.assertEquals(r.status_code,200) + self.assertEqual(r.status_code,200) q = PyQuery(r.content) - self.assertEquals(len(q('form.change-stream')),1) + self.assertEqual(len(q('form.change-stream')),1) # shift to ISE stream messages_before = len(outbox) r = self.client.post(url,dict(stream="ise",comment="7gRMTjBM")) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) self.doc = Document.objects.get(name=self.docname) - self.assertEquals(self.doc.stream_id,'ise') - self.assertEquals(len(outbox),messages_before+1) + self.assertEqual(self.doc.stream_id,'ise') + self.assertEqual(len(outbox),messages_before+1) self.assertTrue('Stream Change Notice' in outbox[-1]['Subject']) self.assertTrue('7gRMTjBM' in str(outbox[-1])) self.assertTrue('7gRMTjBM' in self.doc.latest_event(DocEvent,type='added_comment').desc) @@ -673,9 +673,9 @@ class IndividualInfoFormsTests(TestCase): # shift to an unknown stream (it must be possible to throw a document out of any stream) r = self.client.post(url,dict(stream="")) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) self.doc = Document.objects.get(name=self.docname) - self.assertEquals(self.doc.stream,None) + self.assertEqual(self.doc.stream,None) def test_doc_change_notify(self): url = urlreverse('doc_change_notify', kwargs=dict(name=self.docname)) @@ -683,22 +683,22 @@ class IndividualInfoFormsTests(TestCase): # get r = self.client.get(url) - self.assertEquals(r.status_code,200) + self.assertEqual(r.status_code,200) q = PyQuery(r.content) - self.assertEquals(len(q('form input[name=notify]')),1) + self.assertEqual(len(q('form input[name=notify]')),1) # Provide a list r = self.client.post(url,dict(notify="TJ2APh2P@ietf.org",save_addresses="1")) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) self.doc = Document.objects.get(name=self.docname) - self.assertEquals(self.doc.notify,'TJ2APh2P@ietf.org') + self.assertEqual(self.doc.notify,'TJ2APh2P@ietf.org') # Ask the form to regenerate the list r = self.client.post(url,dict(regenerate_addresses="1")) - self.assertEquals(r.status_code,200) + self.assertEqual(r.status_code,200) self.doc = Document.objects.get(name=self.docname) # Regenerate does not save! - self.assertEquals(self.doc.notify,'TJ2APh2P@ietf.org') + self.assertEqual(self.doc.notify,'TJ2APh2P@ietf.org') q = PyQuery(r.content) self.assertTrue('TJ2Aph2P' not in q('form input[name=notify]')[0].value) @@ -708,23 +708,23 @@ class IndividualInfoFormsTests(TestCase): # get r = self.client.get(url) - self.assertEquals(r.status_code,200) + self.assertEqual(r.status_code,200) q = PyQuery(r.content) - self.assertEquals(len(q('form.change-intended-status')),1) + self.assertEqual(len(q('form.change-intended-status')),1) # don't allow status level to be cleared r = self.client.post(url,dict(intended_std_level="")) - self.assertEquals(r.status_code,200) + self.assertEqual(r.status_code,200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) # change intended status level messages_before = len(outbox) r = self.client.post(url,dict(intended_std_level="bcp",comment="ZpyQFGmA")) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) self.doc = Document.objects.get(name=self.docname) - self.assertEquals(self.doc.intended_std_level_id,'bcp') - self.assertEquals(len(outbox),messages_before+1) + self.assertEqual(self.doc.intended_std_level_id,'bcp') + self.assertEqual(len(outbox),messages_before+1) self.assertTrue('ZpyQFGmA' in str(outbox[-1])) self.assertTrue('ZpyQFGmA' in self.doc.latest_event(DocEvent,type='added_comment').desc) @@ -734,22 +734,22 @@ class IndividualInfoFormsTests(TestCase): # get r = self.client.get(url) - self.assertEquals(r.status_code,200) + self.assertEqual(r.status_code,200) q = PyQuery(r.content) - self.assertEquals(len(q('form.telechat-date')),1) + self.assertEqual(len(q('form.telechat-date')),1) # set a date self.assertFalse(self.doc.latest_event(TelechatDocEvent, "scheduled_for_telechat")) telechat_date = TelechatDate.objects.active().order_by('date')[0].date r = self.client.post(url,dict(telechat_date=telechat_date.isoformat())) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) self.doc = Document.objects.get(name=self.docname) - self.assertEquals(self.doc.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date,telechat_date) + self.assertEqual(self.doc.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date,telechat_date) # Take the doc back off any telechat r = self.client.post(url,dict(telechat_date="")) - self.assertEquals(r.status_code, 302) - self.assertEquals(self.doc.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date,None) + self.assertEqual(r.status_code, 302) + self.assertEqual(self.doc.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date,None) def test_doc_change_iesg_note(self): url = urlreverse('doc_change_iesg_note', kwargs=dict(name=self.docname)) @@ -757,15 +757,15 @@ class IndividualInfoFormsTests(TestCase): # get r = self.client.get(url) - self.assertEquals(r.status_code,200) + self.assertEqual(r.status_code,200) q = PyQuery(r.content) - self.assertEquals(len(q('form.edit-iesg-note')),1) + self.assertEqual(len(q('form.edit-iesg-note')),1) # post r = self.client.post(url,dict(note='ZpyQFGmA\r\nZpyQFGmA')) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) self.doc = Document.objects.get(name=self.docname) - self.assertEquals(self.doc.note,'ZpyQFGmA\nZpyQFGmA') + self.assertEqual(self.doc.note,'ZpyQFGmA\nZpyQFGmA') self.assertTrue('ZpyQFGmA' in self.doc.latest_event(DocEvent,type='added_comment').desc) def test_doc_change_ad(self): @@ -774,16 +774,16 @@ class IndividualInfoFormsTests(TestCase): # get r = self.client.get(url) - self.assertEquals(r.status_code,200) + self.assertEqual(r.status_code,200) q = PyQuery(r.content) - self.assertEquals(len(q('form select[name=ad]')),1) + self.assertEqual(len(q('form select[name=ad]')),1) # change ads ad2 = Person.objects.get(name='Ad No2') r = self.client.post(url,dict(ad=str(ad2.pk))) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) self.doc = Document.objects.get(name=self.docname) - self.assertEquals(self.doc.ad,ad2) + self.assertEqual(self.doc.ad,ad2) self.assertTrue(self.doc.latest_event(DocEvent,type="added_comment").desc.startswith('Shepherding AD changed')) def test_doc_change_shepherd(self): @@ -792,29 +792,29 @@ class IndividualInfoFormsTests(TestCase): login_testing_unauthorized(self, "plain", url) r = self.client.get(url) - self.assertEquals(r.status_code,403) + self.assertEqual(r.status_code,403) # get as the secretariat (and remain secretariat) login_testing_unauthorized(self, "secretary", url) r = self.client.get(url) - self.assertEquals(r.status_code,200) + self.assertEqual(r.status_code,200) q = PyQuery(r.content) - self.assertEquals(len(q('form input[id=id_shepherd]')),1) + self.assertEqual(len(q('form input[id=id_shepherd]')),1) # change the shepherd plain = Person.objects.get(name='Plain Man') plain_email = plain.email_set.all()[0] r = self.client.post(url,dict(shepherd=plain_email)) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) self.doc = Document.objects.get(name=self.docname) - self.assertEquals(self.doc.shepherd,plain) + self.assertEqual(self.doc.shepherd,plain) self.assertTrue(self.doc.latest_event(DocEvent,type="added_comment").desc.startswith('Document shepherd changed to Plain Man')) ad = Person.objects.get(name='Aread Irector') two_answers = "%s,%s" % (plain_email, ad.email_set.all()[0]) r = self.client.post(url,(dict(shepherd=two_answers))) - self.assertEquals(r.status_code,200) + self.assertEqual(r.status_code,200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) @@ -825,17 +825,17 @@ class IndividualInfoFormsTests(TestCase): self.client.login(remote_user="plain") r = self.client.get(url) - self.assertEquals(r.status_code,200) + self.assertEqual(r.status_code,200) q = PyQuery(r.content) - self.assertEquals(len(q('span[id=doc_edit_shepherd_writeup]')),1) + self.assertEqual(len(q('span[id=doc_edit_shepherd_writeup]')),1) # Try again when no longer a shepherd. self.doc.shepherd = None r = self.client.get(url) - self.assertEquals(r.status_code,200) + self.assertEqual(r.status_code,200) q = PyQuery(r.content) - self.assertEquals(len(q('span[id=doc_edit_shepherd_writeup]')),1) + self.assertEqual(len(q('span[id=doc_edit_shepherd_writeup]')),1) def test_doc_change_shepherd_writeup(self): url = urlreverse('doc_edit_shepherd_writeup',kwargs=dict(name=self.docname)) @@ -844,13 +844,13 @@ class IndividualInfoFormsTests(TestCase): login_testing_unauthorized(self, "secretary", url) r = self.client.get(url) - self.assertEquals(r.status_code,200) + self.assertEqual(r.status_code,200) q = PyQuery(r.content) - self.assertEquals(len(q('form textarea[id=id_content]')),1) + self.assertEqual(len(q('form textarea[id=id_content]')),1) # direct edit r = self.client.post(url,dict(content='here is a new writeup',submit_response="1")) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) self.doc = Document.objects.get(name=self.docname) self.assertTrue(self.doc.latest_event(WriteupDocEvent,type="changed_protocol_writeup").text.startswith('here is a new writeup')) @@ -858,13 +858,13 @@ class IndividualInfoFormsTests(TestCase): test_file = StringIO.StringIO("This is a different writeup.") test_file.name = "unnamed" r = self.client.post(url,dict(txt=test_file,submit_response="1")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) doc = Document.objects.get(name=self.docname) self.assertTrue(self.doc.latest_event(WriteupDocEvent,type="changed_protocol_writeup").text.startswith('This is a different writeup.')) # template reset r = self.client.post(url,dict(txt=test_file,reset_text="1")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(q('textarea')[0].text.strip().startswith("As required by RFC 4858")) @@ -881,14 +881,14 @@ class SubmitToIesgTests(TestCase): if remote_user: self.client.login(remote_user=remote_user) r = self.client.get(url) - self.assertEquals(r.status_code,404) + self.assertEqual(r.status_code,404) def verify_can_see(remote_user): self.client.login(remote_user=remote_user) r = self.client.get(url) - self.assertEquals(r.status_code,200) + self.assertEqual(r.status_code,200) q = PyQuery(r.content) - self.assertEquals(len(q('form input[name="confirm"]')),1) + self.assertEqual(len(q('form input[name="confirm"]')),1) url = urlreverse('doc_to_iesg', kwargs=dict(name=self.docname)) @@ -903,7 +903,7 @@ class SubmitToIesgTests(TestCase): self.client.login(remote_user='marschairman') r = self.client.post(url, dict(cancel="1")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) doc = Document.objects.get(pk=self.doc.pk) self.assertTrue(doc.get_state('draft-iesg')==None) @@ -916,14 +916,14 @@ class SubmitToIesgTests(TestCase): mailbox_before = len(outbox) r = self.client.post(url, dict(confirm="1")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) doc = Document.objects.get(pk=self.doc.pk) self.assertTrue(doc.get_state('draft-iesg').slug=='pub-req') self.assertTrue(doc.get_state('draft-stream-ietf').slug=='sub-pub') self.assertTrue(doc.ad!=None) self.assertTrue(doc.docevent_set.count() != docevent_count_pre) - self.assertEquals(len(outbox), mailbox_before + 1) + self.assertEqual(len(outbox), mailbox_before + 1) self.assertTrue("Publication has been requested" in outbox[-1]['Subject']) def setUp(self): @@ -947,7 +947,7 @@ class RequestPublicationTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) subject = q('input#id_subject')[0].get("value") self.assertTrue("Document Action" in subject) @@ -959,11 +959,11 @@ class RequestPublicationTests(TestCase): mailbox_before = len(outbox) r = self.client.post(url, dict(subject=subject, body=body, skiprfceditorpost="1")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) draft = Document.objects.get(name=draft.name) - self.assertEquals(draft.get_state_slug("draft-stream-iab"), "rfc-edit") - self.assertEquals(len(outbox), mailbox_before + 2) + self.assertEqual(draft.get_state_slug("draft-stream-iab"), "rfc-edit") + self.assertEqual(len(outbox), mailbox_before + 2) self.assertTrue("Document Action" in outbox[-2]['Subject']) self.assertTrue("Document Action" in draft.message_set.order_by("-time")[0].subject) # the IANA copy diff --git a/ietf/doc/tests_status_change.py b/ietf/doc/tests_status_change.py index 38c2f2a75..17f33d651 100644 --- a/ietf/doc/tests_status_change.py +++ b/ietf/doc/tests_status_change.py @@ -30,9 +30,9 @@ class StatusChangeTests(TestCase): # normal get should succeed and get a reasonable form r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form select[name=create_in_state]')),1) + self.assertEqual(len(q('form select[name=create_in_state]')),1) ad_strpk = str(Person.objects.get(name='Aread Irector').pk) state_strpk = str(State.objects.get(slug='adrev',type__slug='statchg').pk) @@ -41,25 +41,25 @@ class StatusChangeTests(TestCase): ## Must set a responsible AD r = self.client.post(url,dict(document_name="bogus",title="Bogus Title",ad="",create_in_state=state_strpk,notify='ipu@ietf.org')) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) ## Must set a name r = self.client.post(url,dict(document_name="",title="Bogus Title",ad=ad_strpk,create_in_state=state_strpk,notify='ipu@ietf.org')) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) ## Must not choose a document name that already exists r = self.client.post(url,dict(document_name="imaginary-mid-review",title="Bogus Title",ad=ad_strpk,create_in_state=state_strpk,notify='ipu@ietf.org')) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) ## Must set a title r = self.client.post(url,dict(document_name="bogus",title="",ad=ad_strpk,create_in_state=state_strpk,notify='ipu@ietf.org')) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) @@ -67,12 +67,12 @@ class StatusChangeTests(TestCase): r = self.client.post(url,dict(document_name="imaginary-new",title="A new imaginary status change",ad=ad_strpk, create_in_state=state_strpk,notify='ipu@ietf.org',new_relation_row_blah="rfc9999", statchg_relation_row_blah="tois")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) status_change = Document.objects.get(name='status-change-imaginary-new') - self.assertEquals(status_change.get_state('statchg').slug,'adrev') - self.assertEquals(status_change.rev,u'00') - self.assertEquals(status_change.ad.name,u'Aread Irector') - self.assertEquals(status_change.notify,u'ipu@ietf.org') + self.assertEqual(status_change.get_state('statchg').slug,'adrev') + self.assertEqual(status_change.rev,u'00') + self.assertEqual(status_change.ad.name,u'Aread Irector') + self.assertEqual(status_change.notify,u'ipu@ietf.org') self.assertTrue(status_change.relateddocument_set.filter(relationship__slug='tois',target__document__name='draft-ietf-random-thing')) def test_change_state(self): @@ -84,34 +84,34 @@ class StatusChangeTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form select[name=new_state]')),1) + self.assertEqual(len(q('form select[name=new_state]')),1) # faulty post r = self.client.post(url,dict(new_state="")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) # successful change to AD Review adrev_pk = str(State.objects.get(slug='adrev',type__slug='statchg').pk) r = self.client.post(url,dict(new_state=adrev_pk,comment='RDNK84ZD')) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) doc = Document.objects.get(name='status-change-imaginary-mid-review') - self.assertEquals(doc.get_state('statchg').slug,'adrev') + self.assertEqual(doc.get_state('statchg').slug,'adrev') self.assertTrue(doc.latest_event(DocEvent,type="added_comment").desc.startswith('RDNK84ZD')) self.assertFalse(doc.active_ballot()) # successful change to IESG Evaluation iesgeval_pk = str(State.objects.get(slug='iesgeval',type__slug='statchg').pk) r = self.client.post(url,dict(new_state=iesgeval_pk,comment='TGmZtEjt')) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) doc = Document.objects.get(name='status-change-imaginary-mid-review') - self.assertEquals(doc.get_state('statchg').slug,'iesgeval') + self.assertEqual(doc.get_state('statchg').slug,'iesgeval') self.assertTrue(doc.latest_event(DocEvent,type="added_comment").desc.startswith('TGmZtEjt')) self.assertTrue(doc.active_ballot()) - self.assertEquals(doc.latest_event(BallotPositionDocEvent, type="changed_ballot_position").pos_id,'yes') + self.assertEqual(doc.latest_event(BallotPositionDocEvent, type="changed_ballot_position").pos_id,'yes') def test_edit_notices(self): doc = Document.objects.get(name='status-change-imaginary-mid-review') @@ -121,17 +121,17 @@ class StatusChangeTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form input[name=notify]')),1) - self.assertEquals(doc.notify,q('form input[name=notify]')[0].value) + self.assertEqual(len(q('form input[name=notify]')),1) + self.assertEqual(doc.notify,q('form input[name=notify]')[0].value) # change notice list newlist = '"Foo Bar" ' r = self.client.post(url,dict(notify=newlist)) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) doc = Document.objects.get(name='status-change-imaginary-mid-review') - self.assertEquals(doc.notify,newlist) + self.assertEqual(doc.notify,newlist) self.assertTrue(doc.latest_event(DocEvent,type="added_comment").desc.startswith('Notification list changed')) def test_edit_ad(self): @@ -142,16 +142,16 @@ class StatusChangeTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('select[name=ad]')),1) + self.assertEqual(len(q('select[name=ad]')),1) # change ads ad2 = Person.objects.get(name='Ad No2') r = self.client.post(url,dict(ad=str(ad2.pk))) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) doc = Document.objects.get(name='status-change-imaginary-mid-review') - self.assertEquals(doc.ad,ad2) + self.assertEqual(doc.ad,ad2) self.assertTrue(doc.latest_event(DocEvent,type="added_comment").desc.startswith('Shepherding AD changed')) def test_edit_telechat_date(self): @@ -162,42 +162,42 @@ class StatusChangeTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('select[name=telechat_date]')),1) + self.assertEqual(len(q('select[name=telechat_date]')),1) # set a date self.assertFalse(doc.latest_event(TelechatDocEvent, "scheduled_for_telechat")) telechat_date = TelechatDate.objects.active().order_by('date')[0].date r = self.client.post(url,dict(telechat_date=telechat_date.isoformat())) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) doc = Document.objects.get(name='status-change-imaginary-mid-review') - self.assertEquals(doc.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date,telechat_date) + self.assertEqual(doc.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date,telechat_date) # move it forward a telechat (this should set the returning item bit) telechat_date = TelechatDate.objects.active().order_by('date')[1].date r = self.client.post(url,dict(telechat_date=telechat_date.isoformat())) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) doc = Document.objects.get(name='status-change-imaginary-mid-review') self.assertTrue(doc.returning_item()) # clear the returning item bit r = self.client.post(url,dict(telechat_date=telechat_date.isoformat())) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) doc = Document.objects.get(name='status-change-imaginary-mid-review') self.assertFalse(doc.returning_item()) # set the returning item bit without changing the date r = self.client.post(url,dict(telechat_date=telechat_date.isoformat(),returning_item="on")) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) doc = Document.objects.get(name='status-change-imaginary-mid-review') self.assertTrue(doc.returning_item()) # Take the doc back off any telechat r = self.client.post(url,dict(telechat_date="")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) doc = Document.objects.get(name='status-change-imaginary-mid-review') - self.assertEquals(doc.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date,None) + self.assertEqual(doc.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date,None) def test_edit_lc(self): doc = Document.objects.get(name='status-change-imaginary-mid-review') @@ -213,32 +213,32 @@ class StatusChangeTests(TestCase): # get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form.edit-last-call-text')),1) + self.assertEqual(len(q('form.edit-last-call-text')),1) self.assertTrue( 'RFC9999 from Proposed Standard to Internet Standard' in ''.join(wrap(r.content,2**16))) self.assertTrue( 'RFC9998 from Informational to Historic' in ''.join(wrap(r.content,2**16))) # save r = self.client.post(url,dict(last_call_text="Bogus last call text",save_last_call_text="1")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) last_call_event = doc.latest_event(WriteupDocEvent, type="changed_last_call_text") - self.assertEquals(last_call_event.text,"Bogus last call text") + self.assertEqual(last_call_event.text,"Bogus last call text") # reset r = self.client.post(url,dict(regenerate_last_call_text="1")) - self.assertEquals(r.status_code,200) + self.assertEqual(r.status_code,200) self.assertTrue( 'RFC9999 from Proposed Standard to Internet Standard' in ''.join(wrap(r.content,2**16))) self.assertTrue( 'RFC9998 from Informational to Historic' in ''.join(wrap(r.content,2**16))) # request last call messages_before = len(outbox) r = self.client.post(url,dict(last_call_text='stuff',send_last_call_request='Save+and+Request+Last+Call')) - self.assertEquals(r.status_code,200) + self.assertEqual(r.status_code,200) self.assertTrue( 'Last Call Requested' in ''.join(wrap(r.content,2**16))) - self.assertEquals(len(outbox), messages_before + 1) + self.assertEqual(len(outbox), messages_before + 1) self.assertTrue('iesg-secretary' in outbox[-1]['To']) self.assertTrue('Last Call:' in outbox[-1]['Subject']) self.assertTrue('Last Call Request has been submitted' in ''.join(wrap(unicode(outbox[-1]),2**16))) @@ -259,11 +259,11 @@ class StatusChangeTests(TestCase): # get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form.approve')),1) + self.assertEqual(len(q('form.approve')),1) # There should be two messages to edit - self.assertEquals(q('input#id_form-TOTAL_FORMS').val(),'2') + self.assertEqual(q('input#id_form-TOTAL_FORMS').val(),'2') self.assertTrue( '(rfc9999) to Internet Standard' in ''.join(wrap(r.content,2**16))) self.assertTrue( '(rfc9998) to Historic' in ''.join(wrap(r.content,2**16))) @@ -272,13 +272,13 @@ class StatusChangeTests(TestCase): msg0=default_approval_text(doc,doc.relateddocument_set.all()[0]) msg1=default_approval_text(doc,doc.relateddocument_set.all()[1]) r = self.client.post(url,{'form-0-announcement_text':msg0,'form-1-announcement_text':msg1,'form-TOTAL_FORMS':'2','form-INITIAL_FORMS':'2','form-MAX_NUM_FORMS':''}) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) doc = Document.objects.get(name='status-change-imaginary-mid-review') - self.assertEquals(doc.get_state_slug(),'appr-sent') + self.assertEqual(doc.get_state_slug(),'appr-sent') self.assertFalse(doc.ballot_open("statchg")) - self.assertEquals(len(outbox), messages_before + 2) + self.assertEqual(len(outbox), messages_before + 2) self.assertTrue('Action:' in outbox[-1]['Subject']) self.assertTrue('(rfc9999) to Internet Standard' in ''.join(wrap(unicode(outbox[-1])+unicode(outbox[-2]),2**16))) self.assertTrue('(rfc9998) to Historic' in ''.join(wrap(unicode(outbox[-1])+unicode(outbox[-2]),2**16))) @@ -297,17 +297,17 @@ class StatusChangeTests(TestCase): # get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form.edit-status-change-rfcs')),1) + self.assertEqual(len(q('form.edit-status-change-rfcs')),1) # There should be three rows on the form - self.assertEquals(len(q('tr[id^=relation_row]')),3) + self.assertEqual(len(q('tr[id^=relation_row]')),3) # Try to add a relation to an RFC that doesn't exist r = self.client.post(url,dict(new_relation_row_blah="rfc9997", statchg_relation_row_blah="tois", Submit="Submit")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) @@ -315,7 +315,7 @@ class StatusChangeTests(TestCase): r = self.client.post(url,dict(new_relation_row_blah="rfc9999", statchg_relation_row_blah="", Submit="Submit")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) @@ -323,7 +323,7 @@ class StatusChangeTests(TestCase): r = self.client.post(url,dict(new_relation_row_blah="rfc9999", statchg_relation_row_blah="badslug", Submit="Submit")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) @@ -333,17 +333,17 @@ class StatusChangeTests(TestCase): new_relation_row_foo="rfc9998", statchg_relation_row_foo="tobcp", Submit="Submit")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) doc = Document.objects.get(name='status-change-imaginary-mid-review') - self.assertEquals(doc.relateddocument_set.count(),2) + self.assertEqual(doc.relateddocument_set.count(),2) verify9999 = doc.relateddocument_set.filter(target__name='rfc9999') self.assertTrue(verify9999) - self.assertEquals(verify9999.count(),1) - self.assertEquals(verify9999[0].relationship.slug,'toexp') + self.assertEqual(verify9999.count(),1) + self.assertEqual(verify9999[0].relationship.slug,'toexp') verify9998 = doc.relateddocument_set.filter(target__name='rfc9998') self.assertTrue(verify9998) - self.assertEquals(verify9998.count(),1) - self.assertEquals(verify9998[0].relationship.slug,'tobcp') + self.assertEqual(verify9998.count(),1) + self.assertEqual(verify9998[0].relationship.slug,'tobcp') self.assertTrue(doc.latest_event(DocEvent,type="added_comment").desc.startswith('Affected RFC list changed.')) def setUp(self): @@ -358,7 +358,7 @@ class StatusChangeSubmitTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code,200) + self.assertEqual(r.status_code,200) q = PyQuery(r.content) self.assertTrue(q('textarea')[0].text.strip().startswith("Provide a description")) @@ -367,14 +367,14 @@ class StatusChangeSubmitTests(TestCase): # sane post using textbox path = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev)) - self.assertEquals(doc.rev,u'00') + self.assertEqual(doc.rev,u'00') self.assertFalse(os.path.exists(path)) r = self.client.post(url,dict(content="Some initial review text\n",submit_response="1")) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) doc = Document.objects.get(name='status-change-imaginary-mid-review') - self.assertEquals(doc.rev,u'00') + self.assertEqual(doc.rev,u'00') with open(path) as f: - self.assertEquals(f.read(),"Some initial review text\n") + self.assertEqual(f.read(),"Some initial review text\n") f.close() self.assertTrue( "mid-review-00" in doc.latest_event(NewRevisionDocEvent).desc) @@ -385,7 +385,7 @@ class StatusChangeSubmitTests(TestCase): # A little additional setup # doc.rev is u'00' per the test setup - double-checking that here - if it fails, the breakage is in setUp - self.assertEquals(doc.rev,u'00') + self.assertEqual(doc.rev,u'00') path = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev)) with open(path,'w') as f: f.write('This is the old proposal.') @@ -393,7 +393,7 @@ class StatusChangeSubmitTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code,200) + self.assertEqual(r.status_code,200) q = PyQuery(r.content) self.assertTrue(q('textarea')[0].text.strip().startswith("This is the old proposal.")) @@ -403,25 +403,25 @@ class StatusChangeSubmitTests(TestCase): test_file = StringIO("\x10\x11\x12") # post binary file test_file.name = "unnamed" r = self.client.post(url, dict(txt=test_file,submit_response="1")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) self.assertTrue("does not appear to be a text file" in r.content) # sane post uploading a file test_file = StringIO("This is a new proposal.") test_file.name = "unnamed" r = self.client.post(url,dict(txt=test_file,submit_response="1")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) doc = Document.objects.get(name='status-change-imaginary-mid-review') - self.assertEquals(doc.rev,u'01') + self.assertEqual(doc.rev,u'01') path = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev)) with open(path) as f: - self.assertEquals(f.read(),"This is a new proposal.") + self.assertEqual(f.read(),"This is a new proposal.") f.close() self.assertTrue( "mid-review-01" in doc.latest_event(NewRevisionDocEvent).desc) # verify reset text button works r = self.client.post(url,dict(reset_text="1")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(q('textarea')[0].text.strip().startswith("Provide a description")) diff --git a/ietf/iesg/tests.py b/ietf/iesg/tests.py index 4e8f7f7bd..75fad771c 100644 --- a/ietf/iesg/tests.py +++ b/ietf/iesg/tests.py @@ -26,7 +26,7 @@ class ReviewDecisionsTests(TestCase): url = urlreverse('ietf.iesg.views.review_decisions') r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) self.assertTrue(draft.name in r.content) class IESGAgendaTests(TestCase): @@ -232,7 +232,7 @@ class IESGAgendaTests(TestCase): def test_feed(self): r = self.client.get("/feed/iesg-agenda/") - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) for d in self.telechat_docs.values(): self.assertTrue(d.name in r.content) @@ -240,7 +240,7 @@ class IESGAgendaTests(TestCase): def test_agenda_json(self): r = self.client.get(urlreverse("ietf.iesg.views.agenda_json")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) for k, d in self.telechat_docs.iteritems(): if d.type_id == "charter": @@ -254,7 +254,7 @@ class IESGAgendaTests(TestCase): def test_agenda(self): r = self.client.get(urlreverse("ietf.iesg.views.agenda")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) for k, d in self.telechat_docs.iteritems(): self.assertTrue(d.name in r.content, "%s not in response" % k) @@ -262,7 +262,7 @@ class IESGAgendaTests(TestCase): def test_agenda_txt(self): r = self.client.get(urlreverse("ietf.iesg.views.agenda_txt")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) for k, d in self.telechat_docs.iteritems(): if d.type_id == "charter": @@ -274,7 +274,7 @@ class IESGAgendaTests(TestCase): def test_agenda_scribe_template(self): r = self.client.get(urlreverse("ietf.iesg.views.agenda_scribe_template")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) for k, d in self.telechat_docs.iteritems(): if d.type_id == "charter": @@ -287,7 +287,7 @@ class IESGAgendaTests(TestCase): url = urlreverse("ietf.iesg.views.agenda_moderator_package") login_testing_unauthorized(self, "secretary", url) r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) for k, d in self.telechat_docs.iteritems(): if d.type_id == "charter": @@ -301,7 +301,7 @@ class IESGAgendaTests(TestCase): url = urlreverse("ietf.iesg.views.agenda_package") login_testing_unauthorized(self, "secretary", url) r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) for k, d in self.telechat_docs.iteritems(): if d.type_id == "charter": @@ -314,7 +314,7 @@ class IESGAgendaTests(TestCase): def test_agenda_documents_txt(self): url = urlreverse("ietf.iesg.views.agenda_documents_txt") r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) for k, d in self.telechat_docs.iteritems(): self.assertTrue(d.name in r.content, "%s not in response" % k) @@ -322,7 +322,7 @@ class IESGAgendaTests(TestCase): def test_agenda_documents(self): url = urlreverse("ietf.iesg.views.agenda_documents") r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) for k, d in self.telechat_docs.iteritems(): self.assertTrue(d.name in r.content, "%s not in response" % k) @@ -340,7 +340,7 @@ class IESGAgendaTests(TestCase): url = urlreverse("ietf.iesg.views.telechat_docs_tarfile", kwargs=dict(date=get_agenda_date().isoformat())) r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) import tarfile, StringIO @@ -379,11 +379,11 @@ class RescheduleOnAgendaTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form select[name=%s-telechat_date]' % form_id)), 1) - self.assertEquals(len(q('form input[name=%s-clear_returning_item]' % form_id)), 1) + self.assertEqual(len(q('form select[name=%s-telechat_date]' % form_id)), 1) + self.assertEqual(len(q('form input[name=%s-clear_returning_item]' % form_id)), 1) # reschedule events_before = draft.docevent_set.count() @@ -392,20 +392,20 @@ class RescheduleOnAgendaTests(TestCase): r = self.client.post(url, { '%s-telechat_date' % form_id: d.isoformat(), '%s-clear_returning_item' % form_id: "1" }) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) # check that it moved below the right header in the DOM on the # agenda docs page r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) d_header_pos = r.content.find("IESG telechat %s" % d.isoformat()) draft_pos = r.content.find(draft.name) self.assertTrue(d_header_pos < draft_pos) self.assertTrue(draft.latest_event(TelechatDocEvent, "scheduled_for_telechat")) - self.assertEquals(draft.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date, d) + self.assertEqual(draft.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date, d) self.assertTrue(not draft.latest_event(TelechatDocEvent, "scheduled_for_telechat").returning_item) - self.assertEquals(draft.docevent_set.count(), events_before + 1) + self.assertEqual(draft.docevent_set.count(), events_before + 1) class DeferUndeferTestCase(TestCase): def helper_test_defer(self,name): @@ -430,20 +430,20 @@ class DeferUndeferTestCase(TestCase): # get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form.defer')),1) + self.assertEqual(len(q('form.defer')),1) # defer - self.assertEquals(doc.telechat_date(), first_date) + self.assertEqual(doc.telechat_date(), first_date) r = self.client.post(url,dict()) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) doc = Document.objects.get(name=name) - self.assertEquals(doc.telechat_date(), second_date) + self.assertEqual(doc.telechat_date(), second_date) self.assertTrue(doc.returning_item()) defer_states = dict(draft=['draft-iesg','defer'],conflrev=['conflrev','defer']) if doc.type_id in defer_states: - self.assertEquals(doc.get_state(defer_states[doc.type_id][0]).slug,defer_states[doc.type_id][1]) + self.assertEqual(doc.get_state(defer_states[doc.type_id][0]).slug,defer_states[doc.type_id][1]) def helper_test_undefer(self,name): @@ -472,20 +472,20 @@ class DeferUndeferTestCase(TestCase): # get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form.undefer')),1) + self.assertEqual(len(q('form.undefer')),1) # undefer - self.assertEquals(doc.telechat_date(), second_date) + self.assertEqual(doc.telechat_date(), second_date) r = self.client.post(url,dict()) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) doc = Document.objects.get(name=name) - self.assertEquals(doc.telechat_date(), first_date) + self.assertEqual(doc.telechat_date(), first_date) self.assertTrue(doc.returning_item()) undefer_states = dict(draft=['draft-iesg','iesg-eva'],conflrev=['conflrev','iesgeval']) if doc.type_id in undefer_states: - self.assertEquals(doc.get_state(undefer_states[doc.type_id][0]).slug,undefer_states[doc.type_id][1]) + self.assertEqual(doc.get_state(undefer_states[doc.type_id][0]).slug,undefer_states[doc.type_id][1]) def test_defer_draft(self): self.helper_test_defer('draft-ietf-mars-test') @@ -518,7 +518,7 @@ class IESGDiscussesTests(TestCase): pos.save() r = self.client.get(urlreverse("ietf.iesg.views.discusses")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) self.assertTrue(draft.name in r.content) self.assertTrue(pos.ad.plain_name() in r.content) diff --git a/ietf/message/tests.py b/ietf/message/tests.py index dbb964da7..bb38a43c8 100644 --- a/ietf/message/tests.py +++ b/ietf/message/tests.py @@ -28,7 +28,7 @@ class MessageTests(TestCase): msg.related_groups.add(nomcom) r = self.client.get(urlreverse("nomcom_announcement", kwargs=dict(message_id=msg.id))) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) self.assertTrue(msg.subject in r.content) self.assertTrue(msg.to in r.content) self.assertTrue(msg.frm in r.content) @@ -60,7 +60,7 @@ class SendScheduledAnnouncementsTests(TestCase): send_scheduled_message_from_send_queue(q) - self.assertEquals(len(outbox), mailbox_before + 1) + self.assertEqual(len(outbox), mailbox_before + 1) self.assertTrue("This is a test" in outbox[-1]["Subject"]) self.assertTrue(SendQueue.objects.get(id=q.id).sent_at) @@ -88,7 +88,7 @@ class SendScheduledAnnouncementsTests(TestCase): send_scheduled_message_from_send_queue(q) - self.assertEquals(len(outbox), mailbox_before + 1) + self.assertEqual(len(outbox), mailbox_before + 1) self.assertTrue("This is a test" in outbox[-1]["Subject"]) self.assertTrue("--NextPart" in outbox[-1].as_string()) self.assertTrue(SendQueue.objects.get(id=q.id).sent_at) diff --git a/ietf/secr/announcement/tests.py b/ietf/secr/announcement/tests.py index 0a120d61d..74b98a34c 100644 --- a/ietf/secr/announcement/tests.py +++ b/ietf/secr/announcement/tests.py @@ -22,7 +22,7 @@ class MainTestCase(TestCase): draft = make_test_data() url = reverse('announcement') r = self.client.get(url, REMOTE_USER=SECR_USER) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) class DummyCase(TestCase): name = connection.settings_dict['NAME'] @@ -34,7 +34,7 @@ class UnauthorizedCase(TestCase): url = reverse('announcement') person = Person.objects.filter(role__group__acronym='mars')[0] r = self.client.get(url,REMOTE_USER=person.user) - self.assertEquals(r.status_code, 403) + self.assertEqual(r.status_code, 403) class SubmitCase(TestCase): def test_invalid_submit(self): @@ -44,7 +44,7 @@ class SubmitCase(TestCase): post_data = {'id_subject':''} #self.client.login(remote_user='rcross') r = self.client.post(url,post_data, REMOTE_USER=SECR_USER) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) diff --git a/ietf/secr/areas/tests.py b/ietf/secr/areas/tests.py index 1e99f80ef..3ad9692c4 100644 --- a/ietf/secr/areas/tests.py +++ b/ietf/secr/areas/tests.py @@ -26,7 +26,7 @@ class MainTestCase(TestCase): draft = make_test_data() url = reverse('areas') response = self.client.get(url, REMOTE_USER=SECR_USER) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_view(self): "View Test" @@ -35,4 +35,4 @@ class MainTestCase(TestCase): areas = Group.objects.filter(type='area',state='active') url = reverse('areas_view', kwargs={'name':areas[0].acronym}) response = self.client.get(url, REMOTE_USER=SECR_USER) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) diff --git a/ietf/secr/drafts/tests.py b/ietf/secr/drafts/tests.py index c905dc250..612782921 100644 --- a/ietf/secr/drafts/tests.py +++ b/ietf/secr/drafts/tests.py @@ -14,7 +14,7 @@ class MainTestCase(TestCase): draft = make_test_data() url = reverse('drafts') response = self.client.get(url, REMOTE_USER=SECR_USER) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_view(self): "View Test" @@ -22,4 +22,4 @@ class MainTestCase(TestCase): drafts = Document.objects.filter(type='draft') url = reverse('drafts_view', kwargs={'id':drafts[0].name}) response = self.client.get(url, REMOTE_USER=SECR_USER) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) diff --git a/ietf/secr/groups/tests.py b/ietf/secr/groups/tests.py index fa4e18931..a5477e7a3 100644 --- a/ietf/secr/groups/tests.py +++ b/ietf/secr/groups/tests.py @@ -17,7 +17,7 @@ class GroupsTest(TestCase): post_data = {'group_acronym':group.acronym,'submit':'Search'} response = self.client.post(url,post_data,follow=True, REMOTE_USER=SECR_USER) #assert False, response.content - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) self.failUnless(group.acronym in response.content) # ------- Test Add -------- # @@ -36,7 +36,7 @@ class GroupsTest(TestCase): 'awp-INITIAL_FORMS':'0', 'submit':'Save'} response = self.client.post(url,post_data, REMOTE_USER=SECR_USER) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) self.failUnless('This field is required' in response.content) def test_add_group_dupe(self): @@ -54,7 +54,7 @@ class GroupsTest(TestCase): 'submit':'Save'} response = self.client.post(url,post_data, REMOTE_USER=SECR_USER) #print response.content - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) self.failUnless('Group with this Acronym already exists' in response.content) def test_add_group_success(self): @@ -70,7 +70,7 @@ class GroupsTest(TestCase): 'awp-INITIAL_FORMS':'0', 'submit':'Save'} response = self.client.post(url,post_data, REMOTE_USER=SECR_USER) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # ------- Test View -------- # def test_view(self): @@ -78,7 +78,7 @@ class GroupsTest(TestCase): group = Group.objects.all()[0] url = reverse('groups_view', kwargs={'acronym':group.acronym}) response = self.client.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # ------- Test Edit -------- # def test_edit_valid(self): diff --git a/ietf/secr/ipradmin/tests.py b/ietf/secr/ipradmin/tests.py index 36e33c677..2f9d44b99 100644 --- a/ietf/secr/ipradmin/tests.py +++ b/ietf/secr/ipradmin/tests.py @@ -14,7 +14,7 @@ class MainTestCase(TestCase): draft = make_test_data() url = reverse('ipradmin') response = self.client.get(url, REMOTE_USER=SECR_USER) - self.assertEquals(response.status_code, 301) + self.assertEqual(response.status_code, 301) """ def test_view(self): "View Test" @@ -22,5 +22,5 @@ class MainTestCase(TestCase): drafts = Document.objects.filter(type='draft') url = reverse('drafts_view', kwargs={'id':drafts[0].name}) response = self.client.get(url, REMOTE_USER=SECR_USER) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) """ diff --git a/ietf/secr/meetings/tests.py b/ietf/secr/meetings/tests.py index af7dfd095..cc81c2a71 100644 --- a/ietf/secr/meetings/tests.py +++ b/ietf/secr/meetings/tests.py @@ -13,7 +13,7 @@ class MainTestCase(TestCase): "Main Test" url = reverse('meetings') response = self.client.get(url, REMOTE_USER=SECR_USER) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_view(self): "View Test" @@ -21,4 +21,4 @@ class MainTestCase(TestCase): meeting = Meeting.objects.all()[0] url = reverse('meetings_view', kwargs={'meeting_id':meeting.number}) response = self.client.get(url, REMOTE_USER=SECR_USER) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) diff --git a/ietf/secr/proceedings/tests.py b/ietf/secr/proceedings/tests.py index f62f6daef..242383a62 100644 --- a/ietf/secr/proceedings/tests.py +++ b/ietf/secr/proceedings/tests.py @@ -15,7 +15,7 @@ class MainTestCase(TestCase): make_test_data() url = reverse('proceedings') response = self.client.get(url, REMOTE_USER=SECR_USER) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_view(self): "View Test" @@ -23,4 +23,4 @@ class MainTestCase(TestCase): meeting = Meeting.objects.all()[0] url = reverse('meetings_view', kwargs={'meeting_id':meeting.number}) response = self.client.get(url, REMOTE_USER=SECR_USER) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) diff --git a/ietf/secr/roles/tests.py b/ietf/secr/roles/tests.py index b16300320..4a0d89864 100644 --- a/ietf/secr/roles/tests.py +++ b/ietf/secr/roles/tests.py @@ -20,7 +20,7 @@ class MainTestCase(TestCase): augment_data() url = reverse('roles') response = self.client.get(url, REMOTE_USER=SECR_USER) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_roles_delete(self): draft = make_test_data() diff --git a/ietf/secr/rolodex/tests.py b/ietf/secr/rolodex/tests.py index 61a632c82..307c9b87a 100644 --- a/ietf/secr/rolodex/tests.py +++ b/ietf/secr/rolodex/tests.py @@ -13,7 +13,7 @@ class MainTestCase(TestCase): "Main Test" url = reverse('rolodex') response = self.client.get(url, REMOTE_USER=SECR_USER) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_view(self): "View Test" @@ -21,6 +21,6 @@ class MainTestCase(TestCase): person = Person.objects.all()[0] url = reverse('rolodex_view', kwargs={'id':person.id}) response = self.client.get(url, REMOTE_USER=SECR_USER) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) diff --git a/ietf/secr/sreq/tests.py b/ietf/secr/sreq/tests.py index 9dc6b4a46..798bf03a7 100644 --- a/ietf/secr/sreq/tests.py +++ b/ietf/secr/sreq/tests.py @@ -29,7 +29,7 @@ class MainTestCase(TestCase): draft = make_test_data() url = reverse('sessions') r = self.client.get(url, REMOTE_USER=SECR_USER) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) sched = r.context['scheduled_groups'] unsched = r.context['unscheduled_groups'] self.failUnless(len(sched) == 0) @@ -47,7 +47,7 @@ class SubmitRequestCase(TestCase): 'id_comments':'need projector'} self.client.login( REMOTE_USER=SECR_USER) r = self.client.post(url,post_data) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) """ #assert False, self.client.session..__dict__ diff --git a/ietf/secr/telechat/tests.py b/ietf/secr/telechat/tests.py index 887e4f16f..46a918a1f 100644 --- a/ietf/secr/telechat/tests.py +++ b/ietf/secr/telechat/tests.py @@ -20,7 +20,7 @@ class MainTestCase(TestCase): augment_data() url = reverse('telechat') response = self.client.get(url, REMOTE_USER=SECR_USER) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_doc(self): "View Test" @@ -29,5 +29,5 @@ class MainTestCase(TestCase): date = d.date.strftime('%Y-%m-%d') url = reverse('telechat_doc', kwargs={'date':date}) response = self.client.get(url, REMOTE_USER=SECR_USER) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) diff --git a/ietf/sync/tests.py b/ietf/sync/tests.py index e180da3bd..eba58c4c0 100644 --- a/ietf/sync/tests.py +++ b/ietf/sync/tests.py @@ -298,7 +298,7 @@ class RFCSyncTests(TestCase): # make sure we can apply it again with no changes changed = rfceditor.update_docs_from_rfc_index(data, today - datetime.timedelta(days=30)) - self.assertEquals(len(changed), 0) + self.assertEqual(len(changed), 0) def test_rfc_queue(self): @@ -360,8 +360,8 @@ class RFCSyncTests(TestCase): # make sure we can apply it again with no changes changed, warnings = rfceditor.update_drafts_from_queue(drafts) - self.assertEquals(len(changed), 0) - self.assertEquals(len(warnings), 0) + self.assertEqual(len(changed), 0) + self.assertEqual(len(warnings), 0) class DiscrepanciesTests(TestCase): def test_discrepancies(self): @@ -421,23 +421,23 @@ class RFCEditorUndoTests(TestCase): # get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) self.assertTrue(e2.doc_id in r.content) # delete e2 deleted_before = DeletedEvent.objects.count() r = self.client.post(url, dict(event=e2.id)) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) - self.assertEquals(StateDocEvent.objects.filter(id=e2.id).count(), 0) - self.assertEquals(draft.get_state("draft-rfceditor").slug, "auth") - self.assertEquals(DeletedEvent.objects.count(), deleted_before + 1) + self.assertEqual(StateDocEvent.objects.filter(id=e2.id).count(), 0) + self.assertEqual(draft.get_state("draft-rfceditor").slug, "auth") + self.assertEqual(DeletedEvent.objects.count(), deleted_before + 1) # delete e1 draft.state_cache = None r = self.client.post(url, dict(event=e1.id)) - self.assertEquals(draft.get_state("draft-rfceditor"), None) + self.assertEqual(draft.get_state("draft-rfceditor"), None) # let's just test we can recover e = DeletedEvent.objects.all().order_by("-time", "-id")[0] diff --git a/ietf/wgcharter/tests.py b/ietf/wgcharter/tests.py index 7b55d9f91..477d2af99 100644 --- a/ietf/wgcharter/tests.py +++ b/ietf/wgcharter/tests.py @@ -43,16 +43,16 @@ class EditCharterTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form select[name=charter_state]')), 1) + self.assertEqual(len(q('form select[name=charter_state]')), 1) # faulty post r = self.client.post(url, dict(charter_state="-12345")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) - self.assertEquals(charter.get_state(), first_state) + self.assertEqual(charter.get_state(), first_state) # change state for slug in ("intrev", "extrev", "iesgrev"): @@ -61,10 +61,10 @@ class EditCharterTests(TestCase): mailbox_before = len(outbox) r = self.client.post(url, dict(charter_state=str(s.pk), message="test message")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) charter = Document.objects.get(name="charter-ietf-%s" % group.acronym) - self.assertEquals(charter.get_state_slug(), slug) + self.assertEqual(charter.get_state_slug(), slug) events_now = charter.docevent_set.count() self.assertTrue(events_now > events_before) @@ -76,7 +76,7 @@ class EditCharterTests(TestCase): if slug in ("intrev", "iesgrev"): self.assertTrue(find_event("created_ballot")) - self.assertEquals(len(outbox), mailbox_before + 1) + self.assertEqual(len(outbox), mailbox_before + 1) self.assertTrue("State changed" in outbox[-1]['Subject']) def test_edit_telechat_date(self): @@ -92,24 +92,24 @@ class EditCharterTests(TestCase): self.assertTrue(not charter.latest_event(TelechatDocEvent, "scheduled_for_telechat")) telechat_date = TelechatDate.objects.active()[0].date r = self.client.post(url, dict(name=group.name, acronym=group.acronym, telechat_date=telechat_date.isoformat())) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) charter = Document.objects.get(name=charter.name) self.assertTrue(charter.latest_event(TelechatDocEvent, "scheduled_for_telechat")) - self.assertEquals(charter.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date, telechat_date) + self.assertEqual(charter.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date, telechat_date) # change telechat telechat_date = TelechatDate.objects.active()[1].date r = self.client.post(url, dict(name=group.name, acronym=group.acronym, telechat_date=telechat_date.isoformat())) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) charter = Document.objects.get(name=charter.name) - self.assertEquals(charter.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date, telechat_date) + self.assertEqual(charter.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date, telechat_date) # remove from agenda telechat_date = "" r = self.client.post(url, dict(name=group.name, acronym=group.acronym, telechat_date=telechat_date)) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) charter = Document.objects.get(name=charter.name) self.assertTrue(not charter.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date) @@ -125,10 +125,10 @@ class EditCharterTests(TestCase): # post self.assertTrue(not charter.notify) r = self.client.post(url, dict(notify="someone@example.com, someoneelse@example.com")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) charter = Document.objects.get(name=charter.name) - self.assertEquals(charter.notify, "someone@example.com, someoneelse@example.com") + self.assertEqual(charter.notify, "someone@example.com, someoneelse@example.com") def test_edit_ad(self): make_test_data() @@ -140,18 +140,18 @@ class EditCharterTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('select[name=ad]')),1) + self.assertEqual(len(q('select[name=ad]')),1) # post self.assertTrue(not charter.ad) ad2 = Person.objects.get(name='Ad No2') r = self.client.post(url,dict(ad=str(ad2.pk))) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) charter = Document.objects.get(name=charter.name) - self.assertEquals(charter.ad, ad2) + self.assertEqual(charter.ad, ad2) def test_submit_charter(self): make_test_data() @@ -164,16 +164,16 @@ class EditCharterTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form input[name=txt]')), 1) + self.assertEqual(len(q('form input[name=txt]')), 1) # faulty post test_file = StringIO("\x10\x11\x12") # post binary file test_file.name = "unnamed" r = self.client.post(url, dict(txt=test_file)) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) self.assertTrue("does not appear to be a text file" in r.content) # post @@ -185,14 +185,14 @@ class EditCharterTests(TestCase): test_file.name = "unnamed" r = self.client.post(url, dict(txt=test_file)) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) charter = Document.objects.get(name="charter-ietf-%s" % group.acronym) - self.assertEquals(charter.rev, next_revision(prev_rev)) + self.assertEqual(charter.rev, next_revision(prev_rev)) self.assertTrue("new_revision" in charter.latest_event().type) with open(os.path.join(self.charter_dir, charter.canonical_name() + "-" + charter.rev + ".txt")) as f: - self.assertEquals(f.read(), + self.assertEqual(f.read(), "Windows line\nMac line\nUnix line\n" + utf_8_snippet) class ApproveCharterTests(TestCase): @@ -252,29 +252,29 @@ class ApproveCharterTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue("Send out the announcement" in q('input[type=submit]')[0].get('value')) - self.assertEquals(len(q('pre')), 1) + self.assertEqual(len(q('pre')), 1) # approve mailbox_before = len(outbox) r = self.client.post(url, dict()) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) charter = Document.objects.get(name=charter.name) - self.assertEquals(charter.get_state_slug(), "approved") + self.assertEqual(charter.get_state_slug(), "approved") self.assertTrue(not charter.ballot_open("approve")) - self.assertEquals(charter.rev, "01") + self.assertEqual(charter.rev, "01") self.assertTrue(os.path.exists(os.path.join(self.charter_dir, "charter-ietf-%s-%s.txt" % (group.acronym, charter.rev)))) - self.assertEquals(len(outbox), mailbox_before + 2) + self.assertEqual(len(outbox), mailbox_before + 2) self.assertTrue("WG Action" in outbox[-1]['Subject']) self.assertTrue("Charter approved" in outbox[-2]['Subject']) - self.assertEquals(group.groupmilestone_set.filter(state="charter").count(), 0) - self.assertEquals(group.groupmilestone_set.filter(state="active").count(), 2) - self.assertEquals(group.groupmilestone_set.filter(state="active", desc=m1.desc).count(), 1) - self.assertEquals(group.groupmilestone_set.filter(state="active", desc=m4.desc).count(), 1) + self.assertEqual(group.groupmilestone_set.filter(state="charter").count(), 0) + self.assertEqual(group.groupmilestone_set.filter(state="active").count(), 2) + self.assertEqual(group.groupmilestone_set.filter(state="active", desc=m1.desc).count(), 1) + self.assertEqual(group.groupmilestone_set.filter(state="active", desc=m4.desc).count(), 1) diff --git a/ietf/wginfo/tests.py b/ietf/wginfo/tests.py index 966ee201a..f49b92a35 100644 --- a/ietf/wginfo/tests.py +++ b/ietf/wginfo/tests.py @@ -64,7 +64,7 @@ class GroupPagesTests(TestCase): url = urlreverse('ietf.wginfo.views.active_wgs') r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) self.assertTrue(group.parent.name in r.content) self.assertTrue(group.acronym in r.content) self.assertTrue(group.name in r.content) @@ -81,7 +81,7 @@ class GroupPagesTests(TestCase): url = urlreverse('ietf.wginfo.views.wg_summary_area') r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) self.assertTrue(group.parent.name in r.content) self.assertTrue(group.acronym in r.content) self.assertTrue(group.name in r.content) @@ -89,14 +89,14 @@ class GroupPagesTests(TestCase): url = urlreverse('ietf.wginfo.views.wg_summary_acronym') r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) self.assertTrue(group.acronym in r.content) self.assertTrue(group.name in r.content) self.assertTrue(chair.address in r.content) url = urlreverse('ietf.wginfo.views.wg_charters') r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) self.assertTrue(group.acronym in r.content) self.assertTrue(group.name in r.content) self.assertTrue(group.ad.plain_name() in r.content) @@ -105,7 +105,7 @@ class GroupPagesTests(TestCase): url = urlreverse('ietf.wginfo.views.wg_charters_by_acronym') r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) self.assertTrue(group.acronym in r.content) self.assertTrue(group.name in r.content) self.assertTrue(group.ad.plain_name() in r.content) @@ -119,9 +119,9 @@ class GroupPagesTests(TestCase): url = urlreverse('ietf.wginfo.views.chartering_wgs') r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('table.ietf-doctable td.acronym a:contains("%s")' % group.acronym)), 1) + self.assertEqual(len(q('table.ietf-doctable td.acronym a:contains("%s")' % group.acronym)), 1) def test_bofs(self): draft = make_test_data() @@ -131,9 +131,9 @@ class GroupPagesTests(TestCase): url = urlreverse('ietf.wginfo.views.bofs') r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('table.ietf-doctable td.acronym a:contains("%s")' % group.acronym)), 1) + self.assertEqual(len(q('table.ietf-doctable td.acronym a:contains("%s")' % group.acronym)), 1) def test_group_documents(self): draft = make_test_data() @@ -165,7 +165,7 @@ class GroupPagesTests(TestCase): url = urlreverse('ietf.wginfo.views.group_documents', kwargs=dict(acronym=group.acronym)) r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) self.assertTrue(draft.name in r.content) self.assertTrue(group.name in r.content) self.assertTrue(group.acronym in r.content) @@ -188,7 +188,7 @@ class GroupPagesTests(TestCase): url = urlreverse('ietf.wginfo.views.group_charter', kwargs=dict(acronym=group.acronym)) r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) self.assertTrue(group.name in r.content) self.assertTrue(group.acronym in r.content) self.assertTrue("This is a charter." in r.content) @@ -207,7 +207,7 @@ class GroupPagesTests(TestCase): url = urlreverse('ietf.wginfo.views.history', kwargs=dict(acronym=group.acronym)) r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) self.assertTrue(e.desc in r.content) class GroupEditTests(TestCase): @@ -231,41 +231,41 @@ class GroupEditTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form input[name=acronym]')), 1) + self.assertEqual(len(q('form input[name=acronym]')), 1) # faulty post r = self.client.post(url, dict(acronym="foobarbaz")) # No name - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) - self.assertEquals(len(Group.objects.filter(type="wg")), num_wgs) + self.assertEqual(len(Group.objects.filter(type="wg")), num_wgs) # acronym contains non-alphanumeric r = self.client.post(url, dict(acronym="test...", name="Testing WG", state=bof_state.pk)) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) # acronym contains hyphen r = self.client.post(url, dict(acronym="test-wg", name="Testing WG", state=bof_state.pk)) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) # acronym too short r = self.client.post(url, dict(acronym="t", name="Testing WG", state=bof_state.pk)) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) # acronym doesn't start with an alpha character r = self.client.post(url, dict(acronym="1startwithalpha", name="Testing WG", state=bof_state.pk)) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) # creation r = self.client.post(url, dict(acronym="testwg", name="Testing WG", state=bof_state.pk)) - self.assertEquals(r.status_code, 302) - self.assertEquals(len(Group.objects.filter(type="wg")), num_wgs + 1) + self.assertEqual(r.status_code, 302) + self.assertEqual(len(Group.objects.filter(type="wg")), num_wgs + 1) group = Group.objects.get(acronym="testwg") - self.assertEquals(group.name, "Testing WG") - self.assertEquals(group.charter.name, "charter-ietf-testwg") - self.assertEquals(group.charter.rev, "00-00") + self.assertEqual(group.name, "Testing WG") + self.assertEqual(group.charter.name, "charter-ietf-testwg") + self.assertEqual(group.charter.rev, "00-00") def test_create_based_on_existing(self): make_test_data() @@ -277,29 +277,29 @@ class GroupEditTests(TestCase): # try hijacking area - faulty r = self.client.post(url, dict(name="Test", acronym=group.parent.acronym)) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) - self.assertEquals(len(q('form input[name="confirmed"]')), 0) # can't confirm us out of this + self.assertEqual(len(q('form input[name="confirmed"]')), 0) # can't confirm us out of this # try elevating BoF to WG group.state_id = "bof" group.save() r = self.client.post(url, dict(name="Test", acronym=group.acronym)) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) - self.assertEquals(len(q('form input[name="confirmed"]')), 1) + self.assertEqual(len(q('form input[name="confirmed"]')), 1) - self.assertEquals(Group.objects.get(acronym=group.acronym).state_id, "bof") + self.assertEqual(Group.objects.get(acronym=group.acronym).state_id, "bof") # confirm elevation state = GroupStateName.objects.get(slug="proposed") r = self.client.post(url, dict(name="Test", acronym=group.acronym, confirmed="1",state=state.pk)) - self.assertEquals(r.status_code, 302) - self.assertEquals(Group.objects.get(acronym=group.acronym).state_id, "proposed") - self.assertEquals(Group.objects.get(acronym=group.acronym).name, "Test") + self.assertEqual(r.status_code, 302) + self.assertEqual(Group.objects.get(acronym=group.acronym).state_id, "proposed") + self.assertEqual(Group.objects.get(acronym=group.acronym).name, "Test") def test_edit_info(self): make_test_data() @@ -310,15 +310,15 @@ class GroupEditTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form select[name=parent]')), 1) - self.assertEquals(len(q('form input[name=acronym]')), 1) + self.assertEqual(len(q('form select[name=parent]')), 1) + self.assertEqual(len(q('form input[name=acronym]')), 1) # faulty post Group.objects.create(name="Collision Test Group", acronym="collide") r = self.client.post(url, dict(acronym="collide")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) @@ -331,7 +331,7 @@ class GroupEditTests(TestCase): # post with warning r = self.client.post(url, dict(acronym="oldmars")) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) @@ -363,20 +363,20 @@ class GroupEditTests(TestCase): label = line if 'class="errorlist"' in line: label = "" - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) group = Group.objects.get(acronym="mars") - self.assertEquals(group.name, "Mars Not Special Interest Group") - self.assertEquals(group.parent, area) - self.assertEquals(group.ad, ad) + self.assertEqual(group.name, "Mars Not Special Interest Group") + self.assertEqual(group.parent, area) + self.assertEqual(group.ad, ad) for k in ("chair", "secr", "techadv"): self.assertTrue(group.role_set.filter(name=k, email__address="aread@ietf.org")) self.assertTrue(group.role_set.filter(name="delegate", email__address="ad2@ietf.org")) - self.assertEquals(group.list_email, "mars@mail") - self.assertEquals(group.list_subscribe, "subscribe.mars") - self.assertEquals(group.list_archive, "archive.mars") - self.assertEquals(group.groupurl_set.all()[0].url, "http://mars.mars") - self.assertEquals(group.groupurl_set.all()[0].name, "MARS site") + self.assertEqual(group.list_email, "mars@mail") + self.assertEqual(group.list_subscribe, "subscribe.mars") + self.assertEqual(group.list_archive, "archive.mars") + self.assertEqual(group.groupurl_set.all()[0].url, "http://mars.mars") + self.assertEqual(group.groupurl_set.all()[0].name, "MARS site") self.assertTrue(os.path.exists(os.path.join(self.charter_dir, "%s-%s.txt" % (group.charter.canonical_name(), group.charter.rev)))) def test_conclude(self): @@ -389,24 +389,24 @@ class GroupEditTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form textarea[name=instructions]')), 1) + self.assertEqual(len(q('form textarea[name=instructions]')), 1) # faulty post r = self.client.post(url, dict(instructions="")) # No instructions - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) # request conclusion mailbox_before = len(outbox) r = self.client.post(url, dict(instructions="Test instructions")) - self.assertEquals(r.status_code, 302) - self.assertEquals(len(outbox), mailbox_before + 1) + self.assertEqual(r.status_code, 302) + self.assertEqual(len(outbox), mailbox_before + 1) # the WG remains active until the Secretariat takes action group = Group.objects.get(acronym=group.acronym) - self.assertEquals(group.state_id, "active") + self.assertEqual(group.state_id, "active") class MilestoneTests(TestCase): def create_test_milestones(self): @@ -443,14 +443,14 @@ class MilestoneTests(TestCase): login_testing_unauthorized(self, "secretary", url) r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) self.assertTrue(m1.desc in r.content) self.assertTrue(m2.desc not in r.content) url = urlreverse('wg_edit_charter_milestones', kwargs=dict(acronym=group.acronym)) r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) self.assertTrue(m1.desc not in r.content) self.assertTrue(m2.desc in r.content) @@ -462,7 +462,7 @@ class MilestoneTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) milestones_before = GroupMilestone.objects.count() events_before = group.groupevent_set.count() @@ -480,10 +480,10 @@ class MilestoneTests(TestCase): 'm-1-docs': ",".join(docs), 'action': "save", }) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) - self.assertEquals(GroupMilestone.objects.count(), milestones_before) + self.assertEqual(GroupMilestone.objects.count(), milestones_before) # add r = self.client.post(url, { 'prefix': "m-1", @@ -495,15 +495,15 @@ class MilestoneTests(TestCase): 'm-1-docs': ",".join(docs), 'action': "save", }) - self.assertEquals(r.status_code, 302) - self.assertEquals(GroupMilestone.objects.count(), milestones_before + 1) - self.assertEquals(group.groupevent_set.count(), events_before + 1) + self.assertEqual(r.status_code, 302) + self.assertEqual(GroupMilestone.objects.count(), milestones_before + 1) + self.assertEqual(group.groupevent_set.count(), events_before + 1) m = GroupMilestone.objects.get(desc="Test 3") - self.assertEquals(m.state_id, "active") - self.assertEquals(m.due, due) - self.assertEquals(m.resolved, "") - self.assertEquals(set(m.docs.values_list("name", flat=True)), set(docs)) + self.assertEqual(m.state_id, "active") + self.assertEqual(m.due, due) + self.assertEqual(m.resolved, "") + self.assertEqual(set(m.docs.values_list("name", flat=True)), set(docs)) self.assertTrue("Added milestone" in m.milestonegroupevent_set.all()[0].desc) def test_add_milestone_as_chair(self): @@ -514,7 +514,7 @@ class MilestoneTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) milestones_before = GroupMilestone.objects.count() events_before = group.groupevent_set.count() @@ -530,12 +530,12 @@ class MilestoneTests(TestCase): 'm-1-docs': "", 'action': "save", }) - self.assertEquals(r.status_code, 302) - self.assertEquals(GroupMilestone.objects.count(), milestones_before + 1) + self.assertEqual(r.status_code, 302) + self.assertEqual(GroupMilestone.objects.count(), milestones_before + 1) m = GroupMilestone.objects.get(desc="Test 3") - self.assertEquals(m.state_id, "review") - self.assertEquals(group.groupevent_set.count(), events_before + 1) + self.assertEqual(m.state_id, "review") + self.assertEqual(group.groupevent_set.count(), events_before + 1) self.assertTrue("for review" in m.milestonegroupevent_set.all()[0].desc) def test_accept_milestone(self): @@ -548,7 +548,7 @@ class MilestoneTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) events_before = group.groupevent_set.count() due = self.last_day_of_month(datetime.date.today() + datetime.timedelta(days=365)) @@ -564,11 +564,11 @@ class MilestoneTests(TestCase): 'm1-accept': "accept", 'action': "save", }) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) m = GroupMilestone.objects.get(pk=m1.pk) - self.assertEquals(m.state_id, "active") - self.assertEquals(group.groupevent_set.count(), events_before + 1) + self.assertEqual(m.state_id, "active") + self.assertEqual(group.groupevent_set.count(), events_before + 1) self.assertTrue("to active from review" in m.milestonegroupevent_set.all()[0].desc) def test_delete_milestone(self): @@ -591,12 +591,12 @@ class MilestoneTests(TestCase): 'm1-delete': "checked", 'action': "save", }) - self.assertEquals(r.status_code, 302) - self.assertEquals(GroupMilestone.objects.count(), milestones_before) - self.assertEquals(group.groupevent_set.count(), events_before + 1) + self.assertEqual(r.status_code, 302) + self.assertEqual(GroupMilestone.objects.count(), milestones_before) + self.assertEqual(group.groupevent_set.count(), events_before + 1) m = GroupMilestone.objects.get(pk=m1.pk) - self.assertEquals(m.state_id, "deleted") + self.assertEqual(m.state_id, "deleted") self.assertTrue("Deleted milestone" in m.milestonegroupevent_set.all()[0].desc) def test_edit_milestone(self): @@ -621,12 +621,12 @@ class MilestoneTests(TestCase): 'm1-docs': ",".join(docs), 'action': "save", }) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(len(q('form ul.errorlist')) > 0) m = GroupMilestone.objects.get(pk=m1.pk) - self.assertEquals(GroupMilestone.objects.count(), milestones_before) - self.assertEquals(m.due, m1.due) + self.assertEqual(GroupMilestone.objects.count(), milestones_before) + self.assertEqual(m.due, m1.due) # edit mailbox_before = len(outbox) @@ -640,17 +640,17 @@ class MilestoneTests(TestCase): 'm1-docs': ",".join(docs), 'action': "save", }) - self.assertEquals(r.status_code, 302) - self.assertEquals(GroupMilestone.objects.count(), milestones_before) - self.assertEquals(group.groupevent_set.count(), events_before + 1) + self.assertEqual(r.status_code, 302) + self.assertEqual(GroupMilestone.objects.count(), milestones_before) + self.assertEqual(group.groupevent_set.count(), events_before + 1) m = GroupMilestone.objects.get(pk=m1.pk) - self.assertEquals(m.state_id, "active") - self.assertEquals(m.due, due) - self.assertEquals(m.resolved, "Done") - self.assertEquals(set(m.docs.values_list("name", flat=True)), set(docs)) + self.assertEqual(m.state_id, "active") + self.assertEqual(m.due, due) + self.assertEqual(m.resolved, "Done") + self.assertEqual(set(m.docs.values_list("name", flat=True)), set(docs)) self.assertTrue("Changed milestone" in m.milestonegroupevent_set.all()[0].desc) - self.assertEquals(len(outbox), mailbox_before + 2) + self.assertEqual(len(outbox), mailbox_before + 2) self.assertTrue("Milestones changed" in outbox[-2]["Subject"]) self.assertTrue(group.ad.role_email("ad").address in str(outbox[-2])) self.assertTrue("Milestones changed" in outbox[-1]["Subject"]) @@ -664,21 +664,21 @@ class MilestoneTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(q('input[name=milestone]').val(), str(m1.pk)) + self.assertEqual(q('input[name=milestone]').val(), str(m1.pk)) events_before = group.charter.docevent_set.count() # reset r = self.client.post(url, dict(milestone=[str(m1.pk)])) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) - self.assertEquals(GroupMilestone.objects.get(pk=m1.pk).state_id, "active") - self.assertEquals(GroupMilestone.objects.get(pk=m2.pk).state_id, "deleted") - self.assertEquals(GroupMilestone.objects.filter(due=m1.due, desc=m1.desc, state="charter").count(), 1) + self.assertEqual(GroupMilestone.objects.get(pk=m1.pk).state_id, "active") + self.assertEqual(GroupMilestone.objects.get(pk=m2.pk).state_id, "deleted") + self.assertEqual(GroupMilestone.objects.filter(due=m1.due, desc=m1.desc, state="charter").count(), 1) - self.assertEquals(group.charter.docevent_set.count(), events_before + 2) # 1 delete, 1 add + self.assertEqual(group.charter.docevent_set.count(), events_before + 2) # 1 delete, 1 add def test_send_review_needed_reminders(self): draft = make_test_data() @@ -701,7 +701,7 @@ class MilestoneTests(TestCase): for g in groups_with_milestones_needing_review(): email_milestone_review_reminder(g) - self.assertEquals(len(outbox), mailbox_before) # too early to send reminder + self.assertEqual(len(outbox), mailbox_before) # too early to send reminder # add earlier added milestone @@ -720,7 +720,7 @@ class MilestoneTests(TestCase): for g in groups_with_milestones_needing_review(): email_milestone_review_reminder(g) - self.assertEquals(len(outbox), mailbox_before + 1) + self.assertEqual(len(outbox), mailbox_before + 1) self.assertTrue(group.acronym in outbox[-1]["Subject"]) self.assertTrue(m1.desc in unicode(outbox[-1])) self.assertTrue(m2.desc in unicode(outbox[-1])) @@ -752,7 +752,7 @@ class MilestoneTests(TestCase): for g in groups_needing_milestones_due_reminder(early_warning_days): email_milestones_due(g, early_warning_days) - self.assertEquals(len(outbox), mailbox_before) # none found + self.assertEqual(len(outbox), mailbox_before) # none found m1.resolved = "" m1.save() @@ -765,7 +765,7 @@ class MilestoneTests(TestCase): for g in groups_needing_milestones_due_reminder(early_warning_days): email_milestones_due(g, early_warning_days) - self.assertEquals(len(outbox), mailbox_before + 1) + self.assertEqual(len(outbox), mailbox_before + 1) self.assertTrue(group.acronym in outbox[-1]["Subject"]) self.assertTrue(m1.desc in unicode(outbox[-1])) self.assertTrue(m2.desc in unicode(outbox[-1])) @@ -795,7 +795,7 @@ class MilestoneTests(TestCase): for g in groups_needing_milestones_overdue_reminder(grace_period=30): email_milestones_overdue(g) - self.assertEquals(len(outbox), mailbox_before) # none found + self.assertEqual(len(outbox), mailbox_before) # none found m1.resolved = "" m1.save() @@ -808,7 +808,7 @@ class MilestoneTests(TestCase): for g in groups_needing_milestones_overdue_reminder(grace_period=30): email_milestones_overdue(g) - self.assertEquals(len(outbox), mailbox_before + 1) + self.assertEqual(len(outbox), mailbox_before + 1) self.assertTrue(group.acronym in outbox[-1]["Subject"]) self.assertTrue(m1.desc in unicode(outbox[-1])) self.assertTrue(m2.desc in unicode(outbox[-1])) @@ -827,19 +827,19 @@ class CustomizeWorkflowTests(TestCase): # get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q("form.set-state").find("input[name=state][value='%s']" % state.pk).parents("form").find("input[name=active][value='0']")), 1) + self.assertEqual(len(q("form.set-state").find("input[name=state][value='%s']" % state.pk).parents("form").find("input[name=active][value='0']")), 1) # deactivate state r = self.client.post(url, dict(action="setstateactive", state=state.pk, active="0")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) r = self.client.get(url) q = PyQuery(r.content) - self.assertEquals(len(q("form.set-state").find("input[name=state][value='%s']" % state.pk).parents("form").find("input[name=active][value='1']")), 1) + self.assertEqual(len(q("form.set-state").find("input[name=state][value='%s']" % state.pk).parents("form").find("input[name=active][value='1']")), 1) group = Group.objects.get(acronym=group.acronym) self.assertTrue(state in group.unused_states.all()) @@ -850,13 +850,13 @@ class CustomizeWorkflowTests(TestCase): dict(action="setnextstates", state=state.pk, next_states=next_states)) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) r = self.client.get(url) q = PyQuery(r.content) - self.assertEquals(len(q("form.set-next-states").find("input[name=state][value='%s']" % state.pk).parents('form').find("input[name=next_states][checked=checked]")), len(next_states)) + self.assertEqual(len(q("form.set-next-states").find("input[name=state][value='%s']" % state.pk).parents('form').find("input[name=next_states][checked=checked]")), len(next_states)) transitions = GroupStateTransitions.objects.filter(group=group, state=state) - self.assertEquals(len(transitions), 1) - self.assertEquals(set(transitions[0].next_states.values_list("pk", flat=True)), set(next_states)) + self.assertEqual(len(transitions), 1) + self.assertEqual(set(transitions[0].next_states.values_list("pk", flat=True)), set(next_states)) # change them back to default next_states = state.next_states.values_list("pk", flat=True) @@ -864,11 +864,11 @@ class CustomizeWorkflowTests(TestCase): dict(action="setnextstates", state=state.pk, next_states=next_states)) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) r = self.client.get(url) q = PyQuery(r.content) transitions = GroupStateTransitions.objects.filter(group=group, state=state) - self.assertEquals(len(transitions), 0) + self.assertEqual(len(transitions), 0) # deactivate tag tag = DocTagName.objects.get(slug="w-expert") @@ -876,9 +876,9 @@ class CustomizeWorkflowTests(TestCase): dict(action="settagactive", tag=tag.pk, active="0")) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) r = self.client.get(url) q = PyQuery(r.content) - self.assertEquals(len(q('form').find('input[name=tag][value="%s"]' % tag.pk).parents("form").find("input[name=active]")), 1) + self.assertEqual(len(q('form').find('input[name=tag][value="%s"]' % tag.pk).parents("form").find("input[name=active]")), 1) group = Group.objects.get(acronym=group.acronym) self.assertTrue(tag in group.unused_tags.all())