Differential D149

Squash per-rpm results into per-update
ClosedPublic
Actions

Authored by jskladan on Jun 23 2014, 10:30 AM.

Details

Reviewers
kparal
tflink
Commits
rDEPCKe492c9e60487: Squash per-rpm results into per-update
Summary

Added the possibility to report per-updates rather than per-rpm.

Test Plan

This code is working, and tested using runtask.py, unittests pass.

Diff Detail

Repository
rDEPCK task-depcheck
Lint
Lint Skipped
Unit
Unit Tests Skipped
jskladan retitled this revision from to Squash per-rpm results into per-update.Jun 23 2014, 10:30 AM
jskladan updated this object.
jskladan edited the test plan for this revision. (Show Details)
jskladan added reviewers: tflink, kparal.
jskladan added subscribers: jdulaney, mkrizek.
tflink added a comment.Jun 23 2014, 11:54 AM

Overall, it looks sound to me

depcheck/squash_results.py
12

I'd prefer not to have namespace collisions with the koji module. I realize that we aren't using the base koji lib here but it could happen in the future

49

I assume this is left over from debugging?

jskladan updated this revision to Diff 432.Jun 23 2014, 12:15 PM
  • added tests and slightly restructured code
jskladan updated this object.Jun 23 2014, 12:16 PM
jskladan edited the test plan for this revision. (Show Details)
jskladan updated this revision to Diff 433.Jun 23 2014, 12:24 PM
  • updated according to review
tflink accepted this revision.Jun 23 2014, 12:47 PM

Looks good to me

This revision is now accepted and ready to land.Jun 23 2014, 12:47 PM
kparal added inline comments.Jun 23 2014, 1:22 PM
depcheck.yml
45

The quotes don't have to be there, but of course, don't hurt anybody. Just a note.

jskladan closed this revision.Jun 23 2014, 1:45 PM
jskladan updated this revision to Diff 442.

Closed by commit rDEPCKe492c9e60487 (authored by @jskladan).

Revision Contents

PathPackages
Mdepcheck.yml (4 lines)
Mdepcheck/__init__.py (8 lines)
AMdepcheck/squash_results.py (106 lines)
AMtests/test_squash_results.py (149 lines)

Diff 442

View Options

depcheck.yml

Show All 36 Lines36 - name: run depcheck
37 python: 37​ python:
38 file: run_depcheck.py 38​ file: run_depcheck.py
39 callable: taskotron_run 39​ callable: taskotron_run
40 arch: ['i386'] 40​ arch: ['i386']
41 rpms: ["${workdir}/downloaded_tag/"] 41​ rpms: ["${workdir}/downloaded_tag/"]
42 repos: 42​ repos:
43 - ${yumrepos_i386} 43​ - ${yumrepos_i386}
44 - "workdir_repo": "${workdir}/downloaded_tag/" 44​ - "workdir_repo": "${workdir}/downloaded_tag/"
45 report_format: "rpms" 45​ report_format: "updates"
kparalUnsubmitted
Not Done

The quotes don't have to be there, but of course, don't hurt anybody. Just a note.

46 export: depcheck_output_i386 46​ export: depcheck_output_i386
47 47​
48# - name: report results to resultsdb 48​# - name: report results to resultsdb
49# resultsdb: 49​# resultsdb:
50# results: "{{ depcheck_output_i386 }}" 50​# results: "{{ depcheck_output_i386 }}"
51 51​
52 - name: download koji tag 52​ - name: download koji tag
53 koji: 53​ koji:
Show All 19 Lines72 - name: run depcheck
73 python: 73​ python:
74 file: run_depcheck.py 74​ file: run_depcheck.py
75 callable: taskotron_run 75​ callable: taskotron_run
76 arch: ['x86_64'] 76​ arch: ['x86_64']
77 rpms: ["${workdir}/downloaded_tag/"] 77​ rpms: ["${workdir}/downloaded_tag/"]
78 repos: 78​ repos:
79 - ${yumrepos_x86_64} 79​ - ${yumrepos_x86_64}
80 - "workdir_repo": "${workdir}/downloaded_tag/" 80​ - "workdir_repo": "${workdir}/downloaded_tag/"
81 report_format: "rpms" 81​ report_format: "updates"
82 export: depcheck_output_x86_64 82​ export: depcheck_output_x86_64
83 83​
84# - name: report results to resultsdb 84​# - name: report results to resultsdb
85# resultsdb: 85​# resultsdb:
86# results: "{{ depcheck_output_x86_64 }}" 86​# results: "{{ depcheck_output_x86_64 }}"
87 87​
View Options

depcheck/__init__.py

Show All 21 Lines
22# EPEL dep: python-argparse 22​# EPEL dep: python-argparse
23"""Depcheck mk 2 is a new dependency checker for rpms and yum repositories""" 23​"""Depcheck mk 2 is a new dependency checker for rpms and yum repositories"""
24 24​
25__version__ = '0.0.5' 25​__version__ = '0.0.5'
26 26​
27 27​
28# Check to see if libtaskotron is present; if so, import pass and fail 28​# Check to see if libtaskotron is present; if so, import pass and fail
29 29​
30​# It is crucial that these are the same as libtaskotron/check possible outcomes
30Pass = 'PASSED' 31​Pass = 'PASSED'
31Fail = 'FAILED' 32​Fail = 'FAILED'
32 33​
33import os.path 34​import os.path
34import sys 35​import sys
35import argparse 36​import argparse
36import tempfile 37​import tempfile
37import platform 38​import platform
38import json 39​import json
39 40​
40from . import depcheck 41​from . import depcheck
41from . import metadata 42​from . import metadata
42from . import exc 43​from . import exc
44​from . import squash_results
43 45​
44from libtaskotron.python_utils import iterable 46​from libtaskotron.python_utils import iterable
45 47​
46 48​
47def dir_to_rpms(dirname): 49​def dir_to_rpms(dirname):
48 """Find all rpms in the specified directory 50​ """Find all rpms in the specified directory
49 :param dirname: local directory in which to look for rpms 51​ :param dirname: local directory in which to look for rpms
50 :type dirnema: str 52​ :type dirnema: str
▲ Show 20 Lines • Show All 45 Lines • ▼ Show 20 Line(s)66def run(rpms, arch, repos, report_format="rpms"):
96 98​
97 repomd_files = md_handle.repodata 99​ repomd_files = md_handle.repodata
98 100​
99 output = None 101​ output = None
100 102​
101 depck = depcheck.Depcheck(str(arch), repomd_files, workdir=workdir) 103​ depck = depcheck.Depcheck(str(arch), repomd_files, workdir=workdir)
102 run_result = depck.check_rpm_deps(rpmlist) 104​ run_result = depck.check_rpm_deps(rpmlist)
103 105​
104 output = json.dumps(run_result, indent=4, separators=(',', ': ')) 106​ if report_format == 'updates':
107​ results = squash_results.squash_results(run_result)
108​ output = squash_results.check.export_TAP(results)
109​ else:
110​ output = json.dumps(run_result, indent=4, separators=(',', ': '))
105 111​
106 return output 112​ return output
107 113​
108def depcheck_cli(): 114​def depcheck_cli():
109 parser = argparse.ArgumentParser() 115​ parser = argparse.ArgumentParser()
110 parser.add_argument("rpm", nargs='+', help="RPM to be tested") 116​ parser.add_argument("rpm", nargs='+', help="RPM to be tested")
111 parser.add_argument("-a", "--arch", choices=["i386", "x86_64", "armhfp"], help=""" 117​ parser.add_argument("-a", "--arch", choices=["i386", "x86_64", "armhfp"], help="""
112 Architecture to be tested; support arches are x86, x86_64, and armhfp. 118​ Architecture to be tested; support arches are x86, x86_64, and armhfp.
Show All 26 Lines
View Options

depcheck/squash_results.py

  • This file was added.
1​import os
2​
3​from . import Pass, Fail
4​
5​from libtaskotron.koji_utils import KojiClient
6​from libtaskotron.bodhi_utils import BodhiUtils
7​from libtaskotron import check
8​from libtaskotron.rpm_utils import rpmformat
9​
10​def _squash_rpms_to_builds(run_result, koji_client = None):
11​ """
12​ Converts the per-rpm results created by check_rpm_deps into per-build.
tflinkUnsubmitted
Not Done

I'd prefer not to have namespace collisions with the koji module. I realize that we aren't using the base koji lib here but it could happen in the future

13​ :param run_result: output of the check_rpm_deps method
14​ :type run_result: dict
15​ :returns: dict containing per-nvr results
16​ """
17​ if koji_client is None:
18​ koji_client = KojiClient()
19​
20​ per_nvr = {}
21​ for rpm, result in run_result.items():
22​ buildinfo = koji_client.rpm_to_build(rpm)
23​ nvr = buildinfo['nvr']
24​
25​ if nvr in per_nvr:
26​ if per_nvr[nvr]['result'] == Pass and result['result'] == Fail:
27​ per_nvr[nvr]['result'] = Fail
28​ else:
29​ per_nvr[nvr] = {
30​ 'result': result['result'],
31​ 'details': result['details'],
32​ }
33​
34​ if result['result'] == Fail:
35​ per_nvr[nvr]['details'].extend(result['details'])
36​
37​ return per_nvr
38​
39​
40​def _squash_builds_to_updates(results_nvr, bodhi_client = None):
41​ """
42​ Converts the per-build results created by _squash_rpms_to_builds into
43​ per-update results.
44​ :param results_nvr: output of the _squash_rpms_to_builds
45​ :type results_nvr: dict
46​ :returns: list of CheckDetail
47​ """
48​ if bodhi_client is None:
49​ bodhi_client = BodhiUtils()
tflinkUnsubmitted
Not Done

I assume this is left over from debugging?

50​
51​ pending_ok, pending_fail = bodhi_client.build2update(results_nvr.keys(), strict = True)
52​
53​ updates = {}
54​ for _, update in pending_ok.items():
55​ updates[update['title']] = update
56​
57​ for build, update in pending_fail.items():
58​ if update is None:
59​ #FIXME change print to log
60​ print "ERR: build without an update: %r" % build
61​ continue
62​ if update['title'] not in updates:
63​ updates[update['title']] = update
64​
65​ updates_results = []
66​ for update_title, update in updates.items():
67​ cd = check.CheckDetail(update_title, check.ReportType.BODHI_UPDATE, outcome = 'PASSED')
68​ updates_results.append(cd)
69​
70​ untested_builds = []
71​ for build in update['builds']:
72​ build = build['nvr']
73​
74​ # If build is in pending_fail either when it has no assigned
75​ # update (that can not happen, as we traverse builds of
76​ # a specific update), or when an update was incomplete
77​ # (e.g. missing some builds).
78​ # If an update is incomplete, all it's builds are put
79​ # into the pending_fail, so this should fail early,
80​ if build in pending_fail.keys():
81​ cd.update_outcome('ABORTED')
82​ cd.store('Update was incomplete.')
83​ break
84​
85​ if build not in pending_ok.keys():
86​ cd.update_outcome('ABORTED')
87​ untested_builds.append(build)
88​ print "Untested build %s for update %s" % (build, update_title)
89​ continue
90​
91​ if results_nvr[build]['result'] != Pass:
92​ cd.update_outcome('FAILED')
93​ cd.store('Build %s failed depcheck' % build)
94​ cd.output.extend(results_nvr[build]['details'])
95​
96​ if untested_builds:
97​ cd.store('Update containted untested builds: %s' % untested_builds)
98​
99​ return updates_results
100​
101​
102​def squash_results(run_result, bodhi_client = None, koji_client = None):
103​ per_nvr = _squash_rpms_to_builds(run_result, koji_client)
104​ per_update = _squash_builds_to_updates(per_nvr, bodhi_client)
105​
106​ return per_update
View Options

tests/test_squash_results.py

  • This file was added.
1​import pytest
2​from dingus import Dingus
3​import __builtin__
4​
5​from depcheck import squash_results
6​from depcheck.squash_results import _squash_builds_to_updates, _squash_rpms_to_builds
7​from depcheck import Pass, Fail
8​
9​
10​class TestSquashResults(object):
11​ def test_rpms_to_builds_pass(self):
12​ """
13​ Checks whether _squash_rpms_to_builds provides correct output
14​ when all rpms are 'Pass'.
15​ """
16​ run_results = {
17​ 'rpm1': {'result': Pass, 'details': []},
18​ 'rpm2': {'result': Pass, 'details': ["moo"]},
19​ }
20​ fake_koji = Dingus(rpm_to_build__returns = {'nvr': 'nvr1'})
21​ outcome = _squash_rpms_to_builds(run_results, fake_koji)
22​
23​ assert len(outcome.keys()) == 1
24​ assert outcome['nvr1']['result'] == Pass
25​ assert outcome['nvr1']['details'] == []
26​
27​ def test_rpms_to_builds_fail(self):
28​ """
29​ Checks _squash_rpms_to_builds outcome for a `Fail` rpm.
30​ """
31​ run_results = {
32​ 'rpm1': {'result': Pass, 'details': []},
33​ 'rpm2': {'result': Fail, 'details': ["foo bar"]},
34​ 'rpm3': {'result': Pass, 'details': ["moo"]},
35​ }
36​ fake_koji = Dingus(rpm_to_build__returns = {'nvr': 'nvr1'})
37​ outcome = _squash_rpms_to_builds(run_results, fake_koji)
38​
39​ assert len(outcome.keys()) == 1
40​ assert outcome['nvr1']['result'] == Fail
41​ assert outcome['nvr1']['details'] == ["foo bar"]
42​
43​
44​ def test__squash_builds_to_updates_all_ok(self):
45​ """
46​ Checks whether __squash_builds_to_updates provides correct output
47​ when all the builds in an update passed depchecking.
48​ """
49​
50​ run_results = {
51​ 'nvr1': {'result': Pass, 'details': []},
52​ 'nvr2': {'result': Pass, 'details': []},
53​ }
54​ update = {'title': 'update_name', 'builds': [{'nvr': k} for k in run_results.keys()]}
55​ build_2_update = (
56​ {
57​ 'nvr1': update,
58​ 'nvr2': update,
59​ }, {})
60​
61​ fake_bodhi = Dingus(build2update__returns = build_2_update)
62​
63​ outcome = _squash_builds_to_updates(run_results, fake_bodhi)
64​ assert len(outcome) == 1
65​
66​ detail = outcome[0]
67​ assert detail.item == update['title']
68​ assert detail.outcome == 'PASSED'
69​
70​ def test__squash_builds_to_updates_build_failed(self):
71​ """
72​ Checks whether __squash_builds_to_updates provides correct output
73​ when some of the builds in an update failed depchecking.
74​ """
75​ run_results = {
76​ 'nvr1': {'result': Pass, 'details': []},
77​ 'nvr2': {'result': Fail, 'details': ['### TEST @@@']},
78​ }
79​ update = {'title': 'update_name', 'builds': [{'nvr': k} for k in run_results.keys()]}
80​ build_2_update = (
81​ {
82​ 'nvr1': update,
83​ 'nvr2': update,
84​ }, {})
85​
86​ fake_bodhi = Dingus(build2update__returns = build_2_update)
87​
88​ outcome = _squash_builds_to_updates(run_results, fake_bodhi)
89​ assert len(outcome) == 1
90​
91​ detail = outcome[0]
92​ assert detail.item == update['title']
93​ assert detail.outcome == 'FAILED'
94​ assert '### TEST @@@' in detail.output
95​
96​ def test__squash_builds_to_updates_incomplete_update(self):
97​ """
98​ Checks whether __squash_builds_to_updates provides correct output
99​ when some update is incomplete (i.e. present in the second return-value
100​ from the build2update method).
101​ """
102​ run_results = {
103​ 'nvr1': {'result': Pass, 'details': []},
104​ 'nvr2': {'result': Pass, 'details': []},
105​ }
106​ update = {'title': 'update_name', 'builds': [{'nvr': k} for k in run_results.keys()]}
107​ build_2_update = ({},
108​ {
109​ 'nvr1': update,
110​ 'nvr2': update,
111​ })
112​
113​ fake_bodhi = Dingus(build2update__returns = build_2_update)
114​
115​ outcome = _squash_builds_to_updates(run_results, fake_bodhi)
116​ assert len(outcome) == 1
117​
118​ detail = outcome[0]
119​ assert detail.item == update['title']
120​ assert detail.outcome == 'ABORTED'
121​ assert 'Update was incomplete.' in detail.output
122​
123​ def test__squash_builds_to_updates_missing_build(self):
124​ """
125​ Checks whether __squash_builds_to_updates provides correct output
126​ when update is missing a result for one of its builds.
127​ """
128​ run_results = {
129​ 'nvr1': {'result': Pass, 'details': []},
130​ 'nvr2': {'result': Pass, 'details': []},
131​ }
132​ update = {'title': 'update_name', 'builds': [{'nvr': k} for k in run_results.keys()]}
133​ update['builds'].append({'nvr':'nvr3'})
134​ build_2_update = (
135​ {
136​ 'nvr1': update,
137​ 'nvr2': update,
138​ }, {})
139​
140​ fake_bodhi = Dingus(build2update__returns = build_2_update)
141​
142​ outcome = _squash_builds_to_updates(run_results, fake_bodhi)
143​ assert len(outcome) == 1
144​
145​ detail = outcome[0]
146​ assert detail.item == update['title']
147​ assert detail.outcome == 'ABORTED'
148​ assert "Update containted untested builds: ['nvr3']" in detail.output
149​