process_req_* tests pass

backend/unittest.py

@@ -219,9 +219,10 @@ class BaseFixtureMixin(TestBase):
         cls.fingerprints = NamedObjects(Fingerprint)
         cls.keys = TestKeys()
 
-        # Preload two keys
+        # Preload keys
         cls.keys.create("66B4DFB68CB24EBBD8650BC4F4B4B0CC797EBFAB")
         cls.keys.create("1793D6AB75663E6BF104953A634F4BD1E7AD5568")
+        cls.keys.create("0EED77DC41D760FDE44035FF5556A34E04A3610B")
 
     @classmethod
     def tearDownClass(cls):

process/models.py

@@ -69,7 +69,8 @@ class RequirementVisitorPermissions(ProcessVisitorPermissions):
             pass
         elif self.visitor.is_admin:
             if not self.process.closed:
-                self.add("edit_statements")
+                if self.requirement.type != "keycheck":
+                    self.add("edit_statements")
                 self.add("req_unapprove" if self.requirement.approved_by else "req_approve")
         elif not self.process_frozen:
             if self.requirement.type == "intent":

process/tests/common.py

@@ -9,6 +9,7 @@ import process.models as pmodels
 
 test_fingerprint1 = "1793D6AB75663E6BF104953A634F4BD1E7AD5568"
 test_fingerprint2 = "66B4DFB68CB24EBBD8650BC4F4B4B0CC797EBFAB"
+test_fingerprint3 = "0EED77DC41D760FDE44035FF5556A34E04A3610B"
 
 # Signed with key 1793D6AB75663E6BF104953A634F4BD1E7AD5568
 test_fpr1_signed_invalid_text = """
@@ -88,6 +89,32 @@ vEKSopp/HEL4wBq8JYlvA0DuHTB7+X91XI6LreJQAe+6Jo07iuqmeZd9/pl1Anch
 """
 
 
+# Signed with key 0EED77DC41D760FDE44035FF5556A34E04A3610B
+test_fpr3_signed_valid_text = """
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+I agree to uphold the Social Contract and the Debian Free Software Guidelines in my Debian work.
+I have read the Debian Machine Usage Policy and I accept them.
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJXPZKwAAoJEOjTeuLwn0hy1McP/iZPp6N/ng+P5jXGpuVoAJOa
+Fn5b4RHAVZoQ+6k4NruN56bzn4NysAD4KMaMOOO5Wbu8Q+3CYlA1Kc6sVCHCTK47
+34/oOszvW6WKD4Lf0H8KEiUcpdTMvVktiLjyCHlZDnnydWPG+72KzDm/TqoTxFW9
+mFB1KIbYe2kJPV8yZOoxIEvmyrV4SgwZwG2FkdBn/0JFfJCbE7cXt0KKP0lUctka
+ymB2mLLikXpJepd32ehUs15UAQZMbUSVbyLq28176og6lSWPVpEEeEdUmVuaii99
+qNIKEA0k4UJPmgtJZxnPiGUgIMB9wRarnoZb2rAP0RhQ1lFYfIEz2tAMZ1o9c+Ia
+5KEYnoLEHsF6nWZhrKKFm7TjaseQ5tcYCoZmG6pgraVnjdpUavH54mneQFmO5B7l
+etrcCic0zb2/gDovjFPqJ2xDK+K0LOapUXrrLSOvdwB6tm3e7sGCSOZbibVpIrvC
+WpgKnjrntfADnPx44xRS/RvAqr3TUUICbJq/czKr1+mDKwV/WKCYOWwe8GXRR0IR
+uxODvexBbPuPeImQbpUVPvuIL7gyoxvdlNQwzKX12/GI5CZOEWx87MemRMB0r5oh
+XD3vxTAcdhGDNK+LdTichQxp8nUs1IX5ziPP92jRXF2LjE58a9O4XC2vtEwm8wLm
+kFBhaqNexUs/V1sIBuY5
+=tMbR
+-----END PGP SIGNATURE-----
+"""
+
 class TestProcesses(NamedObjects):
     def __init__(self, **defaults):
         super(TestProcesses, self).__init__(pmodels.Process, **defaults)

process/tests/test_process_req.py

@@ -10,24 +10,25 @@ from backend import const
 from backend import models as bmodels
 from backend.unittest import PersonFixtureMixin, ExpectedSets, TestSet, PageElements
 import process.models as pmodels
-from .common import ProcessFixtureMixin, get_all_process_types, test_fingerprint1, test_fpr1_signed_valid_text
+from .common import (ProcessFixtureMixin, get_all_process_types,
+                     test_fingerprint1, test_fpr1_signed_valid_text,
+                     test_fingerprint2, test_fpr2_signed_valid_text,
+                     test_fingerprint3, test_fpr3_signed_valid_text)
 
 
 class TestProcessReq(ProcessFixtureMixin, TestCase):
     @classmethod
     def __add_extra_tests__(cls):
         for src, tgt in get_all_process_types():
-            reqs = pmodels.Process.objects.compute_requirements(src, tgt)
-            want_am = "am_ok" in reqs
+            want_am = "am_ok" in pmodels.Process.objects.compute_requirements(src, tgt)
             visitors = [None, "pending", "dc", "dc_ga", "dm", "dm_ga", "dd_nu", "dd_u", "dd_e", "dd_r", "activeam", "fd", "dam", "app"]
             if want_am: visitors.append("am")
-            for type in reqs:
-                for visitor in visitors:
-                    if want_am:
-                        cls._add_method(cls._test_perms, type, src, tgt, visitor, am="dd_nu")
-                        cls._add_method(cls._test_perms, type, src, tgt, visitor, am="dd_u")
-                    else:
-                        cls._add_method(cls._test_perms, type, src, tgt, visitor)
+            for visitor in visitors:
+                if want_am:
+                    cls._add_method(cls._test_perms, src, tgt, visitor, am="dd_nu")
+                    cls._add_method(cls._test_perms, src, tgt, visitor, am="dd_u")
+                else:
+                    cls._add_method(cls._test_perms, src, tgt, visitor)
 
     @classmethod
     def setUpClass(cls):
@@ -57,31 +58,60 @@ class TestProcessReq(ProcessFixtureMixin, TestCase):
             wanted.append("statement_delete")
         self.assertContainsElements(response, self.page_elements, *wanted)
 
-    def _test_perms(self, type, src, tgt, visitor, am=None):
-        view = "process_req_" + type
+    def _test_requirement_generic(self, req, visitor):
+        client = self.make_test_client(visitor)
+        response = client.get(req.get_absolute_url())
+        self.assertEqual(response.status_code, 200)
+        visit_perms = req.permissions_of(self.persons[visitor])
+        self.assertPageElements(response, visit_perms)
+
+    def _test_requirement_intent(self, visitor):
+        req = pmodels.Requirement.objects.get(process=self.processes.app, type="intent")
+        pmodels.Statement.objects.create(requirement=req, fpr=self.fingerprints.app, statement=test_fpr1_signed_valid_text, uploaded_by=self.persons.app, uploaded_time=now())
+        self._test_requirement_generic(req, visitor)
+
+    def _test_requirement_sc_dmup(self, visitor):
+        req = pmodels.Requirement.objects.get(process=self.processes.app, type="sc_dmup")
+        pmodels.Statement.objects.create(requirement=req, fpr=self.fingerprints.app, statement=test_fpr1_signed_valid_text, uploaded_by=self.persons.app, uploaded_time=now())
+        self._test_requirement_generic(req, visitor)
+
+    def _test_requirement_advocate(self, visitor):
+        req = pmodels.Requirement.objects.get(process=self.processes.app, type="advocate")
+        pmodels.Statement.objects.create(requirement=req, fpr=self.fingerprints.dd_nu, statement=test_fpr2_signed_valid_text, uploaded_by=self.persons.dd_nu, uploaded_time=now())
+        self._test_requirement_generic(req, visitor)
+
+    def _test_requirement_keycheck(self, visitor):
+        req = pmodels.Requirement.objects.get(process=self.processes.app, type="keycheck")
+        self._test_requirement_generic(req, visitor)
+
+    def _test_requirement_am_ok(self, visitor):
+        req = pmodels.Requirement.objects.get(process=self.processes.app, type="am_ok")
+        pmodels.Statement.objects.create(requirement=req, fpr=self.fingerprints.am, statement=test_fpr3_signed_valid_text, uploaded_by=self.persons.am, uploaded_time=now())
+        self._test_requirement_generic(req, visitor)
+
+    def _test_perms(self, src, tgt, visitor, am=None):
+        # Create process
         self.persons.create("app", status=src)
         self.fingerprints.create("app", person=self.persons.app, fpr=test_fingerprint1, is_active=True, audit_skip=True)
         self.processes.create("app", person=self.persons.app, applying_for=tgt, fd_comment="test")
+        self.fingerprints.create("dd_nu", person=self.persons.dd_nu, fpr=test_fingerprint2, is_active=True, audit_skip=True)
         if am is not None:
             self.persons.create("am", status=am)
+            self.fingerprints.create("am", person=self.persons.am, fpr=test_fingerprint3, is_active=True, audit_skip=True)
             self.ams.create("am", person=self.persons.am)
 
-        req = pmodels.Requirement.objects.get(process=self.processes.app, type=type)
-        if type in ("intent", "sc_dmup", "advocate", "am_ok"):
-            pmodels.Statement.objects.create(requirement=req, fpr=self.fingerprints.app, statement=test_fpr1_signed_valid_text, uploaded_by=self.persons.app, uploaded_time=now())
-
-        client = self.make_test_client(visitor)
-        response = client.get(reverse(view, args=[self.processes.app.pk]))
-        self.assertEqual(response.status_code, 200)
-        visit_perms = req.permissions_of(self.persons[visitor])
-        self.assertPageElements(response, visit_perms)
+        reqs = pmodels.Process.objects.compute_requirements(src, tgt)
+        if "intent" in reqs: self._test_requirement_intent(visitor)
+        if "sc_dmup" in reqs: self._test_requirement_sc_dmup(visitor)
+        if "advocate" in reqs: self._test_requirement_advocate(visitor)
+        if "keycheck" in reqs: self._test_requirement_keycheck(visitor)
+        if "am_ok" in reqs: self._test_requirement_am_ok(visitor)
 
         # Assign am and repeat visit
         if am:
             pmodels.AMAssignment.objects.create(process=self.processes.app, am=self.ams.am, assigned_by=self.persons["fd"], assigned_time=now())
-
-            response = client.get(reverse(view, args=[self.processes.app.pk]))
-            self.assertEqual(response.status_code, 200)
-            visit_perms = req.permissions_of(self.persons[visitor])
-            self.assertPageElements(response, visit_perms)
-
+            if "intent" in reqs: self._test_requirement_intent(visitor)
+            if "sc_dmup" in reqs: self._test_requirement_sc_dmup(visitor)
+            if "advocate" in reqs: self._test_requirement_advocate(visitor)
+            if "keycheck" in reqs: self._test_requirement_keycheck(visitor)
+            if "am_ok" in reqs: self._test_requirement_am_ok(visitor)