[Libreoffice-commits] dev-tools.git: qa/bugzillaChecker.py

[Xisco Fauli]

 qa/bugzillaChecker.py |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

New commits:
commit 2dbaec919ef98e574572b7bac36b6275bd735dba
Author: Xisco Fauli <xiscofauli at libreoffice.org>
Date:   Mon Jun 25 15:41:01 2018 +0200

    QA: Check for bibisectRequest without regression keyword

diff --git a/qa/bugzillaChecker.py b/qa/bugzillaChecker.py
index 1113ea9..c565719 100755
--- a/qa/bugzillaChecker.py
+++ b/qa/bugzillaChecker.py
@@ -243,15 +243,18 @@ def analyze_bugzilla_checkers(statList, bugzillaData, cfg):
                                         if keyword == 'patch' and (common.isOpen(rowStatus) or rowStatus == 'UNCONFIRMED'):
                                             util_add_to_result(lResults, 'patch_added', resultValue)
 
-                                        if keyword == 'regression' and row['status'] != 'RESOLVED' and \
-                                                'bibisectRequest' not in rowKeywords and 'bibisected' not in rowKeywords and \
-                                                'bisected' not in rowKeywords and 'preBibisect' not in rowKeywords and \
-                                                'bibisectNotNeeded' not in rowKeywords and 'notBibisectable' not in rowKeywords:
-                                            util_add_to_result(lResults, 'regression_added', resultValue)
-
-                                        if keyword == 'possibleRegression' and 'possibleRegression' in rowKeywords and \
-                                                row['status'] != 'RESOLVED':
-                                            util_add_to_result(lResults, 'possibleregression_added', resultValue)
+                                        if row['status'] != 'RESOLVED':
+                                            if keyword == 'regression' and 'bibisectRequest' not in rowKeywords and \
+                                                    'bibisected' not in rowKeywords and 'bisected' not in rowKeywords and \
+                                                    'preBibisect' not in rowKeywords and 'bibisectNotNeeded' not in rowKeywords and \
+                                                    'notBibisectable' not in rowKeywords:
+                                                util_add_to_result(lResults, 'regression_added', resultValue)
+
+                                            elif keyword == 'bibisectRequest' and 'regression' not in rowKeywords:
+                                                util_add_to_result(lResults, 'bibisectRequest_added', resultValue)
+
+                                            elif keyword == 'possibleRegression' and 'possibleRegression' in rowKeywords:
+                                                util_add_to_result(lResults, 'possibleregression_added', resultValue)
 
                     elif change['field_name'] == 'whiteboard':
                         if actionDate >= cfg['reportPeriod']: