x
/
stackalytics
Code Issues Proposed changes

Only the last CI result can be treated as merged 

CI may leave several comments for the same patch set. This can happen if
tests are restarted by recheck command. For merged patchsets only the very last
result can be treated as final.

Change-Id: I5a0200089795cc132c083d9683ca4a4f70e37d5f
This commit is contained in:
Ilya Shakhat 2014-07-01 23:05:15 +04:00
parent e22104a14f
commit 94f371d543
2 changed files with 87 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
stackalytics/processor/driverlog.py
View File

@ -44,6 +44,7 @@ def find_ci_result(review, ci_map):
review_id = review['id']
review_number = review['number']
ci_already_seen = set()
for comment in reversed(review.get('comments') or []):
reviewer_id = comment['reviewer'].get('username')
@ -76,9 +77,13 @@ def find_ci_result(review, ci_map):
result = _find_vote(review, ci['id'], patch_set_number)
if result is not None:
is_merged = (review['status'] == 'MERGED' and
patch_set_number == review['patchSets'][-1]
['number'])
is_merged = (
review['status'] == 'MERGED' and
patch_set_number == review['patchSets'][-1]['number'] and
ci['id'] not in ci_already_seen)
ci_already_seen.add(ci['id'])
yield {
'reviewer': comment['reviewer'],
'ci_result': result,

79
tests/unit/test_driverlog.py Normal file
View File

@ -0,0 +1,79 @@
# Copyright (c) 2013 Mirantis Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import testtools
from stackalytics.processor import driverlog
class TestDriverlog(testtools.TestCase):
def setUp(self):
super(TestDriverlog, self).setUp()
def test_find_ci_result_voting_ci(self):
review = {
'record_type': 'review',
'id': 'I1045730e47e9e6ad31fcdfbaefdad77e2f3b2c3e',
'module': 'nova',
'branch': 'master',
'status': 'NEW',
'number': '97860',
'patchSets': [
{'number': '1',
'approvals': [
{'type': 'Verified', 'description': 'Verified',
'value': '1', 'grantedOn': 1234567890 - 1,
'by': {
'name': 'Batman',
'email': 'batman@openstack.org',
'username': 'batman'}},
{'type': 'Verified', 'description': 'Verified',
'value': '-1', 'grantedOn': 1234567890,
'by': {
'name': 'Pikachu',
'email': 'pikachu@openstack.org',
'username': 'pikachu'}},
]}],
'comments': [
{'message': 'Patch Set 1: build successful',
'reviewer': {'username': 'batman'},
'timestamp': 1234567890}
]}
ci_map = {
'batman': {
'name': 'Batman Driver',
'vendor': 'Gotham Inc',
'ci': {
'id': 'batman'
}
}
}
res = list(driverlog.find_ci_result(review, ci_map))
expected_result = {
'reviewer': {'username': 'batman'},
'ci_result': True,
'is_merged': False,
'message': 'build successful',
'date': 1234567890,
'review_id': 'I1045730e47e9e6ad31fcdfbaefdad77e2f3b2c3e',
'review_number': '97860',
'driver_name': 'Batman Driver',
'driver_vendor': 'Gotham Inc',
}
self.assertEqual(1, len(res), 'One CI result is expected')
self.assertEqual(expected_result, res[0])