Differential D176

use libtaskotron's rpms_to_build with multicall()
ClosedPublic
Actions

Authored by garretraziel on Jul 3 2014, 9:00 AM.

Details

Reviewers
kparal
tflink
jskladan
Maniphest Tasks
T250: Optimize the rpm_to_build calls in depcheck's squash_results
Commits
rDEPCK5e1f384bbd74: use libtaskotron's rpms_to_build with multicall()
Summary

Use optimized rpms_to_build from libtaskotron's koji_utils.

Test Plan

py.test tests

Diff Detail

Repository
rDEPCK task-depcheck
Lint
Lint Skipped
Unit
Unit Tests Skipped
garretraziel retitled this revision from to use libtaskotron's rpms_to_build with multicall().Jul 3 2014, 9:00 AM
garretraziel updated this object.
garretraziel edited the test plan for this revision. (Show Details)
garretraziel added reviewers: jskladan, kparal.
jskladan accepted this revision.Jul 3 2014, 9:26 AM
jskladan added inline comments.
depcheck/squash_results.py
22

please just add comment explainig that rpms_to_build returns list of buildinfos in the same respective order as the rpms on input - i.e. that the buildinfos[X] is the buildinfo for rpms[X].

This revision is now accepted and ready to land.Jul 3 2014, 9:26 AM
garretraziel updated this revision to Diff 513.Jul 3 2014, 10:15 AM
  • add comment into _squash_rpms_to_builds
tflink accepted this revision.Jul 3 2014, 11:50 AM

Looks good to me at first glance. I assume that it's been tested with a depcheck run (or several) as well?

garretraziel added a comment.Jul 3 2014, 11:59 AM
In D176#12, @tflink wrote:

Looks good to me at first glance. I assume that it's been tested with a depcheck run (or several) as well?

Yep, I ran runtask -i f19-updates-testing-pending -t koji_tag -a x86_64 -j x86_64/7504 ../task-depcheck/depcheck.yml. I'm not sure if depcheck's output is really correct (it showed a bunch of "PASSED" outcomes, I don't really know how to find out whether they should pass), but it ran without a problem.

garretraziel closed this revision.Jul 11 2014, 8:57 AM
garretraziel updated this revision to Diff 549.

Closed by commit rDEPCK5e1f384bbd74 (authored by Garret Raziel <boloomka@gmail.com>).

Revision Contents

Diff 549

View Options

depcheck/squash_results.py

Show All 12 Lines10def _squash_rpms_to_builds(run_result, koji_client = None):
13 :param run_result: output of the check_rpm_deps method 13​ :param run_result: output of the check_rpm_deps method
14 :type run_result: dict 14​ :type run_result: dict
15 :returns: dict containing per-nvr results 15​ :returns: dict containing per-nvr results
16 """ 16​ """
17 if koji_client is None: 17​ if koji_client is None:
18 koji_client = KojiClient() 18​ koji_client = KojiClient()
19 19​
20 per_nvr = {} 20​ per_nvr = {}
21 for rpm, result in run_result.items(): 21​ rpms = run_result.keys()
22 buildinfo = koji_client.rpm_to_build(rpm) 22​
jskladanUnsubmitted
Not Done

please just add comment explainig that rpms_to_build returns list of buildinfos in the same respective order as the rpms on input - i.e. that the buildinfos[X] is the buildinfo for rpms[X].

23​ # rpms_to_build guarantees that order of buildinfos in list will be the
24​ # same as the order of their respective rpms
25​ buildinfos = koji_client.rpms_to_build(rpms)
26​ for rpm, buildinfo in zip(rpms, buildinfos):
23 nvr = buildinfo['nvr'] 27​ nvr = buildinfo['nvr']
24 28​
25 if nvr in per_nvr: 29​ if nvr in per_nvr:
26 if per_nvr[nvr]['result'] == Pass and result['result'] == Fail: 30​ if per_nvr[nvr]['result'] == Pass and \
31​ run_result[rpm]['result'] == Fail:
27 per_nvr[nvr]['result'] = Fail 32​ per_nvr[nvr]['result'] = Fail
28 else: 33​ else:
29 per_nvr[nvr] = { 34​ per_nvr[nvr] = {
30 'result': result['result'], 35​ 'result': run_result[rpm]['result'],
31 'details': result['details'], 36​ 'details': run_result[rpm]['details'],
32 } 37​ }
33 38​
34 if result['result'] == Fail: 39​ if run_result[rpm]['result'] == Fail:
35 per_nvr[nvr]['details'].extend(result['details']) 40​ per_nvr[nvr]['details'].extend(run_result[rpm]['details'])
36 41​
37 return per_nvr 42​ return per_nvr
38 43​
39 44​
40def _squash_builds_to_updates(results_nvr, bodhi_client = None): 45​def _squash_builds_to_updates(results_nvr, bodhi_client = None):
41 """ 46​ """
42 Converts the per-build results created by _squash_rpms_to_builds into 47​ Converts the per-build results created by _squash_rpms_to_builds into
43 per-update results. 48​ per-update results.
▲ Show 20 Lines • Show All 72 Lines • Show Last 20 Lines
View Options

tests/test_squash_results.py

Show All 11 Lines11 def test_rpms_to_builds_pass(self):
12 """ 12​ """
13 Checks whether _squash_rpms_to_builds provides correct output 13​ Checks whether _squash_rpms_to_builds provides correct output
14 when all rpms are 'Pass'. 14​ when all rpms are 'Pass'.
15 """ 15​ """
16 run_results = { 16​ run_results = {
17 'rpm1': {'result': Pass, 'details': []}, 17​ 'rpm1': {'result': Pass, 'details': []},
18 'rpm2': {'result': Pass, 'details': ["moo"]}, 18​ 'rpm2': {'result': Pass, 'details': ["moo"]},
19 } 19​ }
20 fake_koji = Dingus(rpm_to_build__returns = {'nvr': 'nvr1'}) 20​ fake_koji = Dingus(rpms_to_build__returns = [{'nvr': 'nvr1'},
21​ {'nvr': 'nvr1'}])
21 outcome = _squash_rpms_to_builds(run_results, fake_koji) 22​ outcome = _squash_rpms_to_builds(run_results, fake_koji)
22 23​
23 assert len(outcome.keys()) == 1 24​ assert len(outcome.keys()) == 1
24 assert outcome['nvr1']['result'] == Pass 25​ assert outcome['nvr1']['result'] == Pass
25 assert outcome['nvr1']['details'] == [] 26​ assert outcome['nvr1']['details'] == []
26 27​
27 def test_rpms_to_builds_fail(self): 28​ def test_rpms_to_builds_fail(self):
28 """ 29​ """
29 Checks _squash_rpms_to_builds outcome for a `Fail` rpm. 30​ Checks _squash_rpms_to_builds outcome for a `Fail` rpm.
30 """ 31​ """
31 run_results = { 32​ run_results = {
32 'rpm1': {'result': Pass, 'details': []}, 33​ 'rpm1': {'result': Pass, 'details': []},
33 'rpm2': {'result': Fail, 'details': ["foo bar"]}, 34​ 'rpm2': {'result': Fail, 'details': ["foo bar"]},
34 'rpm3': {'result': Pass, 'details': ["moo"]}, 35​ 'rpm3': {'result': Pass, 'details': ["moo"]},
35 } 36​ }
36 fake_koji = Dingus(rpm_to_build__returns = {'nvr': 'nvr1'}) 37​ fake_koji = Dingus(rpms_to_build__returns = [{'nvr': 'nvr1'},
38​ {'nvr': 'nvr1'},
39​ {'nvr': 'nvr1'}])
37 outcome = _squash_rpms_to_builds(run_results, fake_koji) 40​ outcome = _squash_rpms_to_builds(run_results, fake_koji)
38 41​
39 assert len(outcome.keys()) == 1 42​ assert len(outcome.keys()) == 1
40 assert outcome['nvr1']['result'] == Fail 43​ assert outcome['nvr1']['result'] == Fail
41 assert outcome['nvr1']['details'] == ["foo bar"] 44​ assert outcome['nvr1']['details'] == ["foo bar"]
42 45​
43 46​
44 def test__squash_builds_to_updates_all_ok(self): 47​ def test__squash_builds_to_updates_all_ok(self):
▲ Show 20 Lines • Show All 121 Lines • Show Last 20 Lines