kallithea Changeset - 99f090563f5f

Changeset - 99f090563f5f

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Thomas De Schampheleire - 11 years ago 2015-04-20 17:02:42
thomas.de.schampheleire@gmail.com

changeset status: fix common case where a reviewer did not yet review anything

When a reviewer did not yet make any review, its status for the changeset is
None, causing the code to crash. The unit tests also did not cover this case.

2 files changed with 12 insertions and 2 deletions:

kallithea/model/changeset_status.py

kallithea/tests/models/test_changeset_status.py

0 comments (0 inline, 0 general)

kallithea/model/changeset_status.py

➞

Show inline comments

@@ @@ -72,16 +72,16 @@ class ChangesetStatusModel(BaseModel): @@
         the policy: approve if consensus, reject when at least one reject.
         """
         if not statuses:
             return ChangesetStatus.STATUS_UNDER_REVIEW
         if all(st.status == ChangesetStatus.STATUS_APPROVED for st in statuses):
+        if all(st and st.status == ChangesetStatus.STATUS_APPROVED for st in statuses):
             return ChangesetStatus.STATUS_APPROVED
         if any(st.status == ChangesetStatus.STATUS_REJECTED for st in statuses):
+        if any(st and st.status == ChangesetStatus.STATUS_REJECTED for st in statuses):
             return ChangesetStatus.STATUS_REJECTED
         return ChangesetStatus.STATUS_UNDER_REVIEW
     def calculate_pull_request_result(self, pull_request):
         """

kallithea/tests/models/test_changeset_status.py

➞

Show inline comments

@@ @@ -29,10 +29,20 @@ class TestChangesetStatusCalculation(Bas @@
         ('approve_notreviewed', STATUS_UNDER_REVIEW, [S(STATUS_APPROVED), S(STATUS_NOT_REVIEWED)]),
         ('underreview', STATUS_UNDER_REVIEW, [S(STATUS_UNDER_REVIEW), S(STATUS_UNDER_REVIEW)]),
         ('reject', STATUS_REJECTED, [S(STATUS_REJECTED)]),
         ('reject_underreview', STATUS_REJECTED, [S(STATUS_REJECTED), S(STATUS_UNDER_REVIEW)]),
         ('reject_notreviewed', STATUS_REJECTED, [S(STATUS_REJECTED), S(STATUS_NOT_REVIEWED)]),
         ('notreviewed', STATUS_UNDER_REVIEW, [S(STATUS_NOT_REVIEWED)]),
         ('approve_none', STATUS_UNDER_REVIEW, [S(STATUS_APPROVED), None]),
         ('approve2_none', STATUS_UNDER_REVIEW, [S(STATUS_APPROVED), S(STATUS_APPROVED), None]),
         ('approve_reject_none', STATUS_REJECTED, [S(STATUS_APPROVED), S(STATUS_REJECTED), None]),
         ('approve_underreview_none', STATUS_UNDER_REVIEW, [S(STATUS_APPROVED), S(STATUS_UNDER_REVIEW), None]),
         ('approve_notreviewed_none', STATUS_UNDER_REVIEW, [S(STATUS_APPROVED), S(STATUS_NOT_REVIEWED), None]),
         ('underreview_none', STATUS_UNDER_REVIEW, [S(STATUS_UNDER_REVIEW), S(STATUS_UNDER_REVIEW), None]),
         ('reject_none', STATUS_REJECTED, [S(STATUS_REJECTED), None]),
         ('reject_underreview_none', STATUS_REJECTED, [S(STATUS_REJECTED), S(STATUS_UNDER_REVIEW), None]),
         ('reject_notreviewed_none', STATUS_REJECTED, [S(STATUS_REJECTED), S(STATUS_NOT_REVIEWED), None]),
         ('notreviewed_none', STATUS_UNDER_REVIEW, [S(STATUS_NOT_REVIEWED), None]),
     ])
     def test_result(self, name, expected_result, statuses):
         result = self.m._calculate_status(statuses)
         self.assertEqual(result, expected_result)

0 comments (0 inline, 0 general)