Corrected a conditional expression and improved the test that exercised it. Commit ready for merge.

 - Legacy-Id: 15822

Author: rjsparks

ietf/doc/tests_draft.py

@@ -4,6 +4,7 @@
 import datetime
 import StringIO
 from pyquery import PyQuery
+from collections import Counter
 
 from django.urls import reverse as urlreverse
 from django.conf import settings
@@ -1110,7 +1111,7 @@ def test_cancel_submission(self):
         url = urlreverse('ietf.doc.views_draft.to_iesg', kwargs=dict(name=self.docname))
         self.client.login(username="marschairman", password="marschairman+password")
 
-	r = self.client.post(url, dict(cancel="1"))
+        r = self.client.post(url, dict(cancel="1"))
         self.assertEqual(r.status_code, 302)
 
         doc = Document.objects.get(name=self.docname)
@@ -1121,10 +1122,10 @@ def test_confirm_submission(self):
         self.client.login(username="marschairman", password="marschairman+password")
 
         doc = Document.objects.get(name=self.docname)
-        docevent_count_pre = doc.docevent_set.count()
+        docevents_pre = set(doc.docevent_set.all())
         mailbox_before = len(outbox)
 
-	r = self.client.post(url, dict(confirm="1"))
+        r = self.client.post(url, dict(confirm="1"))
         self.assertEqual(r.status_code, 302)
 
         doc = Document.objects.get(name=self.docname)
@@ -1136,7 +1137,12 @@ def test_confirm_submission(self):
         # checks whether the setup document had an ad or not.
         self.assertTrue(doc.ad!=None)
 
-        self.assertTrue(doc.docevent_set.count() != docevent_count_pre)
+        new_docevents = set(doc.docevent_set.all()) - docevents_pre
+        self.assertEqual(len(new_docevents),3)
+        new_docevent_type_count = Counter([e.type for e in new_docevents])
+        self.assertEqual(new_docevent_type_count['changed_state'],2)
+        self.assertEqual(new_docevent_type_count['started_iesg_process'],1)
+
         self.assertEqual(len(outbox), mailbox_before + 1)
         self.assertTrue("Publication has been requested" in outbox[-1]['Subject'])
         self.assertTrue("aread@" in outbox[-1]['To'])

ietf/doc/views_draft.py

@@ -550,7 +550,7 @@ def to_iesg(request,name):
 
             changes = []
 
-            if not doc.get_state("draft-iesg"):
+            if doc.get_state_slug("draft-iesg") == "idexists":
                 e = DocEvent()
                 e.type = "started_iesg_process"
                 e.by = by