kallithea Changeset - 36d81185efe4

Changeset - 36d81185efe4

Parent rev.

Child rev.

[Not reviewed]

default

0 1 1

Thomas De Schampheleire - 11 years ago 2015-04-17 14:49:37
thomas.de.schampheleire@gmail.com

changeset_status: add unit tests for calculation of overall status

Add unit tests for the calculation of the review status of a changeset/pull
request. To allow this, some reorganization of the ChangesetStatusModel is
needed.

2 files changed with 61 insertions and 8 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

@@ @@ -63,41 +63,56 @@ class ChangesetStatusModel(BaseModel): @@
             q = q.filter(ChangesetStatus.pull_request == pull_request)
         else:
             raise Exception('Please specify revision or pull_request')
         q = q.order_by(ChangesetStatus.version.asc())
         return q
     def _calculate_status(self, statuses):
         """
         Given a list of statuses, calculate the resulting status, according to
         the policy: approve if consensus.
         """
         approved_votes = 0
         for st in statuses:
             if st and st.status == ChangesetStatus.STATUS_APPROVED:
                 approved_votes += 1
         result = ChangesetStatus.STATUS_UNDER_REVIEW
         if approved_votes and approved_votes == len(statuses):
             result = ChangesetStatus.STATUS_APPROVED
         return result
     def calculate_pull_request_result(self, pull_request):
         """
         Policy: approve if consensus. Only approve and reject counts as valid votes.
         Return a tuple (reviewers, pending reviewers, pull request status)
         Only approve and reject counts as valid votes.
         """
         # collect latest votes from all voters
         cs_statuses = dict()
         for st in reversed(self.get_statuses(pull_request.org_repo,
                                              pull_request=pull_request,
                                              with_revisions=True)):
             cs_statuses[st.author.username] = st
         # collect votes from official reviewers
         pull_request_reviewers = []
         pull_request_pending_reviewers = []
-        approved_votes = 0
+        relevant_statuses = []
         for r in pull_request.reviewers:
             st = cs_statuses.get(r.user.username)
             if st and st.status == ChangesetStatus.STATUS_APPROVED:
                 approved_votes += 1
             relevant_statuses.append(st)
             if not st or st.status in (ChangesetStatus.STATUS_NOT_REVIEWED,
                                        ChangesetStatus.STATUS_UNDER_REVIEW):
                 st = None
                 pull_request_pending_reviewers.append(r.user)
             pull_request_reviewers.append((r.user, st))
         # calculate result
         result = ChangesetStatus.STATUS_UNDER_REVIEW
         if approved_votes and approved_votes == len(pull_request.reviewers):
             result = ChangesetStatus.STATUS_APPROVED
         result = self._calculate_status(relevant_statuses)
         return (pull_request_reviewers,
                 pull_request_pending_reviewers,
                 result)
     def get_statuses(self, repo, revision=None, pull_request=None,

kallithea/tests/models/test_changeset_status.py

➞

Show inline comments

@@ new file 100644 @@
 from kallithea.tests import *
 from kallithea.model.changeset_status import ChangesetStatusModel
 from kallithea.model.db import ChangesetStatus
 # shorthands
 STATUS_APPROVED = ChangesetStatus.STATUS_APPROVED
 STATUS_REJECTED = ChangesetStatus.STATUS_REJECTED
 STATUS_NOT_REVIEWED = ChangesetStatus.STATUS_NOT_REVIEWED
 STATUS_UNDER_REVIEW = ChangesetStatus.STATUS_UNDER_REVIEW
 class ChangesetStatusMock(object):
     def __init__(self, status):
         self.status = status
 S = ChangesetStatusMock
 class TestChangesetStatusCalculation(BaseTestCase):
     def setUp(self):
         self.m = ChangesetStatusModel()
     @parameterized.expand([
         ('empty list', STATUS_UNDER_REVIEW, []),
         ('approve', STATUS_APPROVED, [S(STATUS_APPROVED)]),
         ('approve2', STATUS_APPROVED, [S(STATUS_APPROVED), S(STATUS_APPROVED)]),
         ('approve_reject', STATUS_UNDER_REVIEW, [S(STATUS_APPROVED), S(STATUS_REJECTED)]),
         ('approve_underreview', STATUS_UNDER_REVIEW, [S(STATUS_APPROVED), S(STATUS_UNDER_REVIEW)]),
         ('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_UNDER_REVIEW, [S(STATUS_REJECTED)]),
         ('reject_underreview', STATUS_UNDER_REVIEW, [S(STATUS_REJECTED), S(STATUS_UNDER_REVIEW)]),
         ('reject_notreviewed', STATUS_UNDER_REVIEW, [S(STATUS_REJECTED), S(STATUS_NOT_REVIEWED)]),
         ('notreviewed', STATUS_UNDER_REVIEW, [S(STATUS_NOT_REVIEWED)]),
     ])
     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)