Differential D183

set summary
ClosedPublic
Actions

Authored by kparal on Jul 4 2014, 4:05 PM.

Details

Reviewers
tflink
mkrizek
jdulaney
jskladan
Commits
rDEPCK234c36c7afb2: set summary
Summary

Similarly to upgradepath in D181, this helps to see results in
ResultsDB, at least until it displays item as a new column (T279).

Before:

ok - $CHECKNAME for Bodhi update sylpheed-3.4.2-1.fc20
  ---
  arch: x86_64
  item: sylpheed-3.4.2-1.fc20
  outcome: PASSED
  type: bodhi_update
  ...

After:

ok - $CHECKNAME for Bodhi update sylpheed-3.4.2-1.fc20
  ---
  arch: x86_64
  item: sylpheed-3.4.2-1.fc20
  outcome: PASSED
  summary: sylpheed-3.4.2-1.fc20 into F20 stable
  type: bodhi_update
  ...

But of course, this is not about console output, but about output at http://resultsdb-stg.cloud.fedoraproject.org/results?testcase_name=depcheck .

Test Plan

unit tests adjusted, manual execution OK

Diff Detail

Repository
rDEPCK task-depcheck
Lint
Lint Skipped
Unit
Unit Tests Skipped
kparal retitled this revision from to set summary.Jul 4 2014, 4:05 PM
kparal updated this object.
kparal edited the test plan for this revision. (Show Details)
kparal added reviewers: jskladan, mkrizek, tflink, jdulaney.
This revision is now accepted and ready to land.Jul 8 2014, 12:54 PM
kparal closed this revision.Jul 8 2014, 1:14 PM
kparal updated this revision to Diff 538.

Closed by commit rDEPCK234c36c7afb2 (authored by @kparal).

Revision Contents

Diff 538

View Options

depcheck/squash_results.py

Show First 20 Lines • Show All 90 Lines • ▼ Show 20 Line(s)71 for build in update['builds']:
91 if results_nvr[build]['result'] != Pass: 91​ if results_nvr[build]['result'] != Pass:
92 cd.update_outcome('FAILED') 92​ cd.update_outcome('FAILED')
93 cd.store('Build %s failed depcheck' % build) 93​ cd.store('Build %s failed depcheck' % build)
94 cd.output.extend(results_nvr[build]['details']) 94​ cd.output.extend(results_nvr[build]['details'])
95 95​
96 if untested_builds: 96​ if untested_builds:
97 cd.store('Update containted untested builds: %s' % untested_builds) 97​ cd.store('Update containted untested builds: %s' % untested_builds)
98 98​
99​ # set summary
100​ if update['request']:
101​ target = 'into %s %s' % (update['release']['name'],
102​ update['request'])
103​ else:
104​ target = 'in %s %s' % (update['release']['name'],
105​ update['status'])
106​ cd.summary = '%s %s' % (update_title, target)
107​
99 return updates_results 108​ return updates_results
100 109​
101 110​
102def squash_results(run_result, bodhi_client = None, koji_client = None): 111​def squash_results(run_result, bodhi_client = None, koji_client = None):
103 per_nvr = _squash_rpms_to_builds(run_result, koji_client) 112​ per_nvr = _squash_rpms_to_builds(run_result, koji_client)
104 per_update = _squash_builds_to_updates(per_nvr, bodhi_client) 113​ per_update = _squash_builds_to_updates(per_nvr, bodhi_client)
105 114​
106 return per_update 115​ return per_update
View Options

tests/test_squash_results.py

Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Line(s)44 def test__squash_builds_to_updates_all_ok(self):
46 Checks whether __squash_builds_to_updates provides correct output 46​ Checks whether __squash_builds_to_updates provides correct output
47 when all the builds in an update passed depchecking. 47​ when all the builds in an update passed depchecking.
48 """ 48​ """
49 49​
50 run_results = { 50​ run_results = {
51 'nvr1': {'result': Pass, 'details': []}, 51​ 'nvr1': {'result': Pass, 'details': []},
52 'nvr2': {'result': Pass, 'details': []}, 52​ 'nvr2': {'result': Pass, 'details': []},
53 } 53​ }
54 update = {'title': 'update_name', 'builds': [{'nvr': k} for k in run_results.keys()]} 54​ update = {'title': 'update_name',
55​ 'builds': [{'nvr': k} for k in run_results.keys()],
56​ 'release': {'name': 'F20'},
57​ 'request': 'stable',
58​ }
55 build_2_update = ( 59​ build_2_update = (
56 { 60​ {
57 'nvr1': update, 61​ 'nvr1': update,
58 'nvr2': update, 62​ 'nvr2': update,
59 }, {}) 63​ }, {})
60 64​
61 fake_bodhi = Dingus(build2update__returns = build_2_update) 65​ fake_bodhi = Dingus(build2update__returns = build_2_update)
62 66​
63 outcome = _squash_builds_to_updates(run_results, fake_bodhi) 67​ outcome = _squash_builds_to_updates(run_results, fake_bodhi)
64 assert len(outcome) == 1 68​ assert len(outcome) == 1
65 69​
66 detail = outcome[0] 70​ detail = outcome[0]
67 assert detail.item == update['title'] 71​ assert detail.item == update['title']
68 assert detail.outcome == 'PASSED' 72​ assert detail.outcome == 'PASSED'
69 73​
70 def test__squash_builds_to_updates_build_failed(self): 74​ def test__squash_builds_to_updates_build_failed(self):
71 """ 75​ """
72 Checks whether __squash_builds_to_updates provides correct output 76​ Checks whether __squash_builds_to_updates provides correct output
73 when some of the builds in an update failed depchecking. 77​ when some of the builds in an update failed depchecking.
74 """ 78​ """
75 run_results = { 79​ run_results = {
76 'nvr1': {'result': Pass, 'details': []}, 80​ 'nvr1': {'result': Pass, 'details': []},
77 'nvr2': {'result': Fail, 'details': ['### TEST @@@']}, 81​ 'nvr2': {'result': Fail, 'details': ['### TEST @@@']},
78 } 82​ }
79 update = {'title': 'update_name', 'builds': [{'nvr': k} for k in run_results.keys()]} 83​ update = {'title': 'update_name',
84​ 'builds': [{'nvr': k} for k in run_results.keys()],
85​ 'release': {'name': 'F20'},
86​ 'request': 'stable',
87​ }
80 build_2_update = ( 88​ build_2_update = (
81 { 89​ {
82 'nvr1': update, 90​ 'nvr1': update,
83 'nvr2': update, 91​ 'nvr2': update,
84 }, {}) 92​ }, {})
85 93​
86 fake_bodhi = Dingus(build2update__returns = build_2_update) 94​ fake_bodhi = Dingus(build2update__returns = build_2_update)
87 95​
Show All 10 Lines104 def test__squash_builds_to_updates_incomplete_update(self):
98 Checks whether __squash_builds_to_updates provides correct output 106​ Checks whether __squash_builds_to_updates provides correct output
99 when some update is incomplete (i.e. present in the second return-value 107​ when some update is incomplete (i.e. present in the second return-value
100 from the build2update method). 108​ from the build2update method).
101 """ 109​ """
102 run_results = { 110​ run_results = {
103 'nvr1': {'result': Pass, 'details': []}, 111​ 'nvr1': {'result': Pass, 'details': []},
104 'nvr2': {'result': Pass, 'details': []}, 112​ 'nvr2': {'result': Pass, 'details': []},
105 } 113​ }
106 update = {'title': 'update_name', 'builds': [{'nvr': k} for k in run_results.keys()]} 114​ update = {'title': 'update_name',
115​ 'builds': [{'nvr': k} for k in run_results.keys()],
116​ 'release': {'name': 'F20'},
117​ 'request': 'stable',
118​ }
107 build_2_update = ({}, 119​ build_2_update = ({},
108 { 120​ {
109 'nvr1': update, 121​ 'nvr1': update,
110 'nvr2': update, 122​ 'nvr2': update,
111 }) 123​ })
112 124​
113 fake_bodhi = Dingus(build2update__returns = build_2_update) 125​ fake_bodhi = Dingus(build2update__returns = build_2_update)
114 126​
Show All 9 Lines135 def test__squash_builds_to_updates_missing_build(self):
124 """ 136​ """
125 Checks whether __squash_builds_to_updates provides correct output 137​ Checks whether __squash_builds_to_updates provides correct output
126 when update is missing a result for one of its builds. 138​ when update is missing a result for one of its builds.
127 """ 139​ """
128 run_results = { 140​ run_results = {
129 'nvr1': {'result': Pass, 'details': []}, 141​ 'nvr1': {'result': Pass, 'details': []},
130 'nvr2': {'result': Pass, 'details': []}, 142​ 'nvr2': {'result': Pass, 'details': []},
131 } 143​ }
132 update = {'title': 'update_name', 'builds': [{'nvr': k} for k in run_results.keys()]} 144​ update = {'title': 'update_name',
145​ 'builds': [{'nvr': k} for k in run_results.keys()],
146​ 'release': {'name': 'F20'},
147​ 'request': 'stable',
148​ }
133 update['builds'].append({'nvr':'nvr3'}) 149​ update['builds'].append({'nvr':'nvr3'})
134 build_2_update = ( 150​ build_2_update = (
135 { 151​ {
136 'nvr1': update, 152​ 'nvr1': update,
137 'nvr2': update, 153​ 'nvr2': update,
138 }, {}) 154​ }, {})
139 155​
140 fake_bodhi = Dingus(build2update__returns = build_2_update) 156​ fake_bodhi = Dingus(build2update__returns = build_2_update)
Show All 9 Lines