Done with the second pass focusing on test coverage. Lots of test tweaks, some new tests, a couple of bugs fixed. The session request code views need to be redone to allow testing.

 - Legacy-Id: 10035

Author: rjsparks

ietf/doc/mails.py

@@ -201,6 +201,8 @@ def generate_approval_mail_approved(request, doc):
                             )
 
 def generate_approval_mail_rfc_editor(request, doc):
+    # This is essentially dead code - it is only exercised if the IESG ballots on some other stream's document,
+    # which does not happen now that we have conflict reviews.
     disapproved = doc.get_state_slug("draft-iesg") in DO_NOT_PUBLISH_IESG_STATES
     doc_type = "RFC" if doc.get_state_slug() == "rfc" else "Internet Draft"
 

ietf/doc/tests_ballot.py

@@ -152,7 +152,7 @@ def test_send_ballot_comment(self):
         # send
         mailbox_before = len(outbox)
 
-        r = self.client.post(url, dict(cc="test@example.com", cc_state_change="1",cc_group_list="1"))
+        r = self.client.post(url, dict(cc="test298347@example.com", cc_state_change="1",cc_group_list="1"))
         self.assertEqual(r.status_code, 302)
 
         self.assertEqual(len(outbox), mailbox_before + 1)
@@ -162,16 +162,18 @@ def test_send_ballot_comment(self):
         self.assertTrue(draft.name in m['Subject'])
         self.assertTrue("clearer title" in str(m))
         self.assertTrue("Test!" in str(m))
+        self.assertTrue("iesg@" in m['To'])
         self.assertTrue("somebody@example.com" in m['Cc'])
-        self.assertTrue("test@example.com" in m['Cc'])
+        self.assertTrue("test298347@example.com" in m['Cc'])
         self.assertTrue(draft.group.list_email)
         self.assertTrue(draft.group.list_email in m['Cc'])
 
         r = self.client.post(url, dict(cc=""))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(len(outbox), mailbox_before + 2)
-        #TODO this would be a good place to test actual mailtoken expansions
-        #if we can find a way to get the real, or at least representative, data in place.
+        m = outbox[-1]
+        self.assertTrue("iesg@" in m['To'])
+        self.assertFalse(draft.group.list_email in m['Cc'])
 
 
 class BallotWriteupsTests(TestCase):
@@ -235,6 +237,8 @@ def test_request_last_call(self):
         self.assertEqual(len(outbox), mailbox_before + 1)
         self.assertTrue("Last Call" in outbox[-1]['Subject'])
         self.assertTrue(draft.name in outbox[-1]['Subject'])
+        self.assertTrue('iesg-secretary@' in outbox[-1]['To'])
+        self.assertTrue('aread@' in outbox[-1]['Cc'])
 
     def test_edit_ballot_writeup(self):
         draft = make_test_data()
@@ -389,12 +393,18 @@ def test_approve_ballot(self):
         self.assertEqual(draft.get_state_slug("draft-iesg"), "ann")
         self.assertEqual(len(outbox), mailbox_before + 2)
         self.assertTrue("Protocol Action" in outbox[-2]['Subject'])
+        self.assertTrue("ietf-announce" in outbox[-2]['To'])
+        self.assertTrue("rfc-editor" in outbox[-2]['Cc'])
         # the IANA copy
         self.assertTrue("Protocol Action" in outbox[-1]['Subject'])
         self.assertTrue(not outbox[-1]['CC'])
+        self.assertTrue('drafts-approval@icann.org' in outbox[-1]['To'])
         self.assertTrue("Protocol Action" in draft.message_set.order_by("-time")[0].subject)
 
     def test_disapprove_ballot(self):
+        # This tests a codepath that is not used in production
+        # and that has already had some drift from usefulness (it results in a
+        # older-style conflict review response). 
         draft = make_test_data()
         draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="nopubadw"))
 
@@ -412,7 +422,6 @@ def test_disapprove_ballot(self):
         self.assertEqual(len(outbox), mailbox_before + 1)
         self.assertTrue("NOT be published" in str(outbox[-1]))
 
-
 class MakeLastCallTests(TestCase):
     def test_make_last_call(self):
         draft = make_test_data()
@@ -441,10 +450,17 @@ def test_make_last_call(self):
         draft = Document.objects.get(name=draft.name)
         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 + 2)
 
         self.assertTrue("Last Call" in outbox[-2]['Subject'])
+        self.assertTrue("ietf-announce@" in outbox[-2]['To'])
+        for prefix in ['draft-ietf-mars-test','mars-chairs','aread']:
+            self.assertTrue(prefix+"@" in outbox[-2]['Cc'])
+
         self.assertTrue("Last Call" in outbox[-1]['Subject'])
+        self.assertTrue("drafts-lastcall@icann.org" in outbox[-1]['To'])
+
         self.assertTrue("Last Call" in draft.message_set.order_by("-time")[0].subject)
 
 class DeferUndeferTestCase(TestCase):
@@ -490,11 +506,16 @@ def helper_test_defer(self,name):
         if doc.type_id in defer_states:
            self.assertEqual(doc.get_state(defer_states[doc.type_id][0]).slug,defer_states[doc.type_id][1])
         self.assertTrue(doc.active_defer_event())
+
         self.assertEqual(len(outbox), mailbox_before + 2)
-        #self.assertTrue("State Update" in outbox[-3]['Subject'])
-        self.assertTrue("Telechat update" in outbox[-2]['Subject'])
+
+        self.assertTrue('Telechat update' in outbox[-2]['Subject'])
+        self.assertTrue('iesg-secretary@' in outbox[-2]['To'])
+        self.assertTrue('iesg@' in outbox[-2]['To'])
+
         self.assertTrue("Deferred" in outbox[-1]['Subject'])
         self.assertTrue(doc.file_tag() in outbox[-1]['Subject'])
+        self.assertTrue('iesg@' in outbox[-1]['To'])
 
         # Ensure it's not possible to defer again
         r = self.client.get(url)
@@ -547,8 +568,11 @@ def helper_test_undefer(self,name):
         self.assertFalse(doc.active_defer_event())
         self.assertEqual(len(outbox), mailbox_before + 2)
         self.assertTrue("Telechat update" in outbox[-2]['Subject'])
+        self.assertTrue('iesg-secretary@' in outbox[-2]['To'])
+        self.assertTrue('iesg@' in outbox[-2]['To'])
         self.assertTrue("Undeferred" in outbox[-1]['Subject'])
         self.assertTrue(doc.file_tag() in outbox[-1]['Subject'])
+        self.assertTrue('iesg@' in outbox[-1]['To'])
 
         # Ensure it's not possible to undefer again
         r = self.client.get(url)

ietf/doc/tests_charter.py

@@ -14,7 +14,7 @@
 from ietf.iesg.models import TelechatDate
 from ietf.person.models import Person
 from ietf.utils.test_utils import TestCase
-from ietf.utils.mail import outbox
+from ietf.utils.mail import outbox, empty_outbox
 from ietf.utils.test_data import make_test_data
 from ietf.utils.test_utils import login_testing_unauthorized
 
@@ -97,7 +97,12 @@ def find_event(t):
                 self.assertTrue(find_event("created_ballot"))
 
             self.assertEqual(len(outbox), mailbox_before + 2)
+
             self.assertTrue("state changed" in outbox[-2]['Subject'].lower())
+            self.assertTrue("iesg-secretary@" in outbox[-2]['To'])
+
+            self.assertTrue("State Update Notice" in outbox[-1]['Subject'])
+            self.assertTrue("ames-chairs@" in outbox[-1]['To'])
 
     def test_edit_telechat_date(self):
         make_test_data()
@@ -285,6 +290,9 @@ def test_edit_announcement_text(self):
                     announcement_text=default_review_text(draft.group, charter, by).text,
                     send_text="1"))
                 self.assertEqual(len(outbox), mailbox_before + 1)
+                self.assertTrue('WG Review' in outbox[-1]['Subject'])
+                self.assertTrue('ietf-announce@' in outbox[-1]['To'])
+                self.assertTrue('mars-wg@' in outbox[-1]['Cc'])
 
             # save
             r = self.client.post(url, dict(
@@ -333,11 +341,12 @@ def test_edit_ballot_writeupnotes(self):
         self.assertTrue("This is a simple test" in charter.latest_event(WriteupDocEvent, type="changed_ballot_writeup_text").text)
 
         # send
-        mailbox_before = len(outbox)
+        empty_outbox()
         r = self.client.post(url, dict(
             ballot_writeup="This is a simple test.",
             send_ballot="1"))
-        self.assertEqual(len(outbox), mailbox_before + 1)
+        self.assertEqual(len(outbox), 1)
+        self.assertTrue('Evaluation' in outbox[0]['Subject'])
 
     def test_approve(self):
         make_test_data()
@@ -393,7 +402,7 @@ def test_approve(self):
         self.assertEqual(len(q('pre')), 1)
 
         # approve
-        mailbox_before = len(outbox)
+        empty_outbox()
 
         r = self.client.post(url, dict())
         self.assertEqual(r.status_code, 302)
@@ -405,9 +414,12 @@ def test_approve(self):
         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.assertEqual(len(outbox), mailbox_before + 2)
-        self.assertTrue("WG Action" in outbox[-1]['Subject'])
-        self.assertTrue("approved" in outbox[-2]['Subject'].lower())
+        self.assertEqual(len(outbox), 2)
+        self.assertTrue("approved" in outbox[0]['Subject'].lower())
+        self.assertTrue("iesg-secretary" in outbox[0]['To'])
+        self.assertTrue("WG Action" in outbox[1]['Subject'])
+        self.assertTrue("ietf-announce" in outbox[1]['To'])
+        self.assertTrue("ames-wg@ietf.org" in outbox[1]['Cc'])
 
         self.assertEqual(group.groupmilestone_set.filter(state="charter").count(), 0)
         self.assertEqual(group.groupmilestone_set.filter(state="active").count(), 2)

ietf/doc/tests_conflict_review.py

@@ -15,7 +15,7 @@
 from ietf.iesg.models import TelechatDate
 from ietf.name.models import StreamName
 from ietf.utils.test_utils import TestCase
-from ietf.utils.mail import outbox
+from ietf.utils.mail import outbox, empty_outbox
 from ietf.utils.test_data  import make_test_data
 from ietf.utils.test_utils import login_testing_unauthorized
 
@@ -115,10 +115,14 @@ def test_start_review_as_stream_owner(self):
         self.assertEquals(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')])
+
         self.assertEqual(len(outbox), messages_before + 2)
+
         self.assertTrue('Conflict Review requested' in outbox[-1]['Subject'])
-        #self.assertTrue(any('iesg-secretary@ietf.org' in x['To'] for x in outbox[-2:]))
-        #self.assertTrue(any(settings.IANA_EVAL_EMAIL in x['To'] for x in outbox[-2:]))
+        self.assertTrue('drafts-eval@icann.org' in outbox[-1]['To'])
+
+        self.assertTrue('Conflict Review requested' in outbox[-2]['Subject'])
+        self.assertTrue('iesg-secretary@' in outbox[-2]['To'])
 
 
     def test_change_state(self):
@@ -278,20 +282,23 @@ def approve_test_helper(self,approve_type):
             self.assertTrue( 'NOT be published' in ''.join(wrap(r.content,2**16)))
 
         # submit
-        messages_before = len(outbox)
+        empty_outbox()
         r = self.client.post(url,dict(announcement_text=default_approval_text(doc)))
         self.assertEqual(r.status_code, 302)
 
         doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
         self.assertEqual(doc.get_state_slug(),approve_type+'-sent')
         self.assertFalse(doc.ballot_open("conflrev"))
 
-        self.assertEqual(len(outbox), messages_before + 1)
-        self.assertTrue('Results of IETF-conflict review' in outbox[-1]['Subject'])
+        self.assertEqual(len(outbox), 1)
+        self.assertTrue('Results of IETF-conflict review' in outbox[0]['Subject'])
+        self.assertTrue('irtf-chair' in outbox[0]['To'])
+        self.assertTrue('ietf-announce@' in outbox[0]['Cc'])
+        self.assertTrue('iana@' in outbox[0]['Cc'])
         if approve_type == 'appr-noprob':
-            self.assertTrue( 'IESG has no problem' in ''.join(wrap(unicode(outbox[-1]),2**16)))
+            self.assertTrue( 'IESG has no problem' in ''.join(wrap(unicode(outbox[0]),2**16)))
         else:
-            self.assertTrue( 'NOT be published' in ''.join(wrap(unicode(outbox[-1]),2**16)))
+            self.assertTrue( 'NOT be published' in ''.join(wrap(unicode(outbox[0]),2**16)))
 
 
     def test_approve_reqnopub(self):