Merged in [16109] from rjsparks@nostrum.com:

    Protect drafts in certain IRTF states from expiring. Fixes ietf-tools#2669.
 - Legacy-Id: 16129
Note: SVN reference [16109] has been migrated to Git commit 003e472

Author: levkowetz

ietf/doc/expire.py

@@ -21,23 +21,29 @@ def expirable_draft(draft):
     if draft.type_id != 'draft':
         return False
     log.assertion('draft.get_state_slug("draft-iesg")')
-    return (draft.expires and draft.get_state_slug() == "active"
-            and draft.get_state_slug("draft-iesg") in ("idexists", "watching", "dead")
-            and draft.get_state_slug("draft-stream-%s" % draft.stream_id) not in ("rfc-edit", "pub")
-            and not draft.tags.filter(slug="rfc-rev"))
+    # return (draft.expires and draft.get_state_slug() == "active"
+    #         and draft.get_state_slug("draft-iesg") in ("idexists", "watching", "dead")
+    #         and draft.get_state_slug("draft-stream-%s" % draft.stream_id) not in ("rfc-edit", "pub")
+    #         and not draft.tags.filter(slug="rfc-rev"))
+    return bool(expirable_drafts(Document.objects.filter(pk=draft.pk)))
 
-def expirable_drafts():
+def expirable_drafts(queryset=None):
     """Return a queryset with expirable drafts."""
     # the general rule is that each active draft is expirable, unless
     # it's in a state where we shouldn't touch it
-    d = Document.objects.filter(states__type="draft", states__slug="active").exclude(expires=None)
+    if not queryset:
+        queryset = Document.objects.all()
+
+    d = queryset.filter(states__type="draft", states__slug="active").exclude(expires=None)
 
     nonexpirable_states = []
     # all IESG states except I-D Exists, AD Watching, and Dead block expiry
     nonexpirable_states += list(State.objects.filter(used=True, type="draft-iesg").exclude(slug__in=("idexists","watching", "dead")))
     # sent to RFC Editor and RFC Published block expiry (the latter
     # shouldn't be possible for an active draft, though)
     nonexpirable_states += list(State.objects.filter(used=True, type__in=("draft-stream-iab", "draft-stream-irtf", "draft-stream-ise"), slug__in=("rfc-edit", "pub")))
+    # other IRTF states that block expiration
+    nonexpirable_states += list(State.objects.filter(used=True, type_id="draft-stream-irtf", slug__in=("irsgpoll", "iesg-rev",)))
 
     d = d.exclude(states__in=nonexpirable_states)
 

ietf/doc/tests_draft.py

@@ -655,6 +655,15 @@ def test_expire_drafts(self):
         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)))
 
+        draft.delete()
+
+        rgdraft = RgDraftFactory(expires=datetime.datetime.now())
+        self.assertEqual(len(list(get_expired_drafts())), 1)
+        for slug in ('iesg-rev','irsgpoll'):
+            rgdraft.set_state(State.objects.get(type_id='draft-stream-irtf',slug=slug))
+            self.assertEqual(len(list(get_expired_drafts())), 0)
+
+
     def test_clean_up_draft_files(self):
         draft = WgDraftFactory()