From 063b27abfc8bc60bd2fbee1147cd339d6effd003 Mon Sep 17 00:00:00 2001 From: Morgan Fainberg Date: Mon, 19 May 2014 14:08:14 -0700 Subject: [PATCH] Remove WIP reviews from reviewday report With the changeover to WIP being part of Workflow, the old WIP detection no longer worked. This change makes WIP detection work again and removes WIP reviews from the reviewday output. Change-Id: Ic059b1e20708d3d6b6391fcebd7ff57afe7d7b0e Closes-bug: 1321018 --- bin/reviewday | 3 ++- reviewday/mergeprop.py | 11 ++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/bin/reviewday b/bin/reviewday index 28291ab..0838334 100755 --- a/bin/reviewday +++ b/bin/reviewday @@ -71,7 +71,8 @@ for project in PROJECTS: for review in gerrit_reviews(project): try: mp = MergeProp(lp, review, cur_timestamp) - projects[project].append(mp) + if not mp.is_wip: + projects[project].append(mp) except: print 'Error creating merge prop %s' % review diff --git a/reviewday/mergeprop.py b/reviewday/mergeprop.py index 3da143a..9e3f513 100644 --- a/reviewday/mergeprop.py +++ b/reviewday/mergeprop.py @@ -67,6 +67,7 @@ class MergeProp(object): self.status = review['status'] self.number = review['number'] self.feedback = [] + self.is_wip = False self.lowest_feedback = None self.highest_feedback = None @@ -79,15 +80,11 @@ class MergeProp(object): self.lowest_feedback = min(self.lowest_feedback, value) or value self.highest_feedback = max(self.highest_feedback, value) or value + if approval['type'] == 'Workflow' and value == -1: + self.is_wip = True + # Make use of the feedback in calculating the score cause, reason, score = self._calc_score(lp, cur_timestamp) - if self.status == 'WORKINPROGRESS': - # if the review status is WIP, always make it a score of 0 and - # adjust the subject to indicate it's a WIP - score = 0 - self.subject = '(WIP): %s' % self.subject - else: - score += 1 self.score = score self.reason = reason self.cause = cause