Differential D305

bodhi directive src option, koji tests update
ClosedPublic
Actions

Authored by lbrabec on Mar 5 2015, 12:30 PM.

Details

Reviewers
kparal
jskladan
Maniphest Tasks
T312: Add `src: True/False` option to Bodhi directive
Commits
rLTRNe01d29285fc6: bodhi directive src option, koji tests update
Summary

Added src: True/False option to Bodhi directive, test upadate.
Noticed that Koji directive tests were incomplete, added new test.

Test Plan

py.test testing

Diff Detail

Repository
rLTRN libtaskotron
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
lbrabec retitled this revision from to bodhi directive src option, koji tests update.Mar 5 2015, 12:30 PM
lbrabec updated this object.
lbrabec edited the test plan for this revision. (Show Details)
lbrabec added reviewers: kparal, jskladan.
kparal requested changes to this revision.Mar 5 2015, 1:53 PM

Look good in general. Please verify the unit tests still pass after doing the adjustments :) Thanks.

libtaskotron/directives/bodhi_directive.py
30

Read this once more :-)

142–145

This should not be needed, the error is thrown by koji_utils.py when used in action_download().

libtaskotron/directives/koji_directive.py
129–133 ↗(On Diff #836)

This should not be needed, the error is thrown by koji_utils.py when used a little down below.

This revision now requires changes to proceed.Mar 5 2015, 1:53 PM
lbrabec updated this revision to Diff 837.Mar 5 2015, 2:20 PM
  • doc polishing, code polishing
kparal accepted this revision.Mar 5 2015, 3:07 PM

Looks good.

This revision is now accepted and ready to land.Mar 5 2015, 3:07 PM
Closed by commit rLTRNe01d29285fc6: bodhi directive src option, koji tests update (authored by Lukas Brabec <lbrabec@redhat.com>). · Explain WhyMar 6 2015, 9:32 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 838

View Options

libtaskotron/directives/bodhi_directive.py

Show All 21 Lines16parameters:
22 bodhi_id: 22​ bodhi_id:
23 required: true 23​ required: true
24 description: Bodhi update ID to download. This is usually in the form of 24​ description: Bodhi update ID to download. This is usually in the form of
25 ``FEDORA-2014-7485`` or ``pykickstart-1.99.42-1.fc20,anaconda-20.23-1.fc20``. 25​ ``FEDORA-2014-7485`` or ``pykickstart-1.99.42-1.fc20,anaconda-20.23-1.fc20``.
26 type: str 26​ type: str
27 arch: 27​ arch:
28 required: true 28​ required: true
29 description: | 29​ description: |
30 a list of architectures for which to download RPMs. In addition to 30​ a list of architectures for which to download RPMs.
kparalUnsubmitted
Not Done

Read this once more :-)

31 architectures supported by Taskotron by default, ``src`` is supported as ​
32 well. ​
33 31​
34 Note: ``noarch`` RPMs are always automatically downloaded even when not 32​ Note: ``noarch`` RPMs are always automatically downloaded even when not
35 requested, unless ``src`` is the only architecture requested. 33​ requested, unless ``arch=[]`` and ``src=True``.
36 type: list of str 34​ type: list of str
35​ src:
36​ required: false
37​ description: download also ``src`` RPM files
38​ type: bool
39​ default: False
37returns: | 40​returns: |
38 A dictionary containing following items: 41​ A dictionary containing following items:
39 42​
40 * ``downloaded_rpms``: (list of str) a list of local filenames of the 43​ * ``downloaded_rpms``: (list of str) a list of local filenames of the
41 downloaded RPMs 44​ downloaded RPMs
42raises: | 45​raises: |
43 * :class:`.TaskotronDirectiveError`: if no update with ``bodhi_id`` has been 46​ * :class:`.TaskotronDirectiveError`: if no update with ``bodhi_id`` has been
44 found 47​ found
45 * :class:`.TaskotronRemoteError`: if downloading failed 48​ * :class:`.TaskotronRemoteError`: if downloading failed
49​ * :class:`.TaskotronValueError`: if ``arch=[]`` and ``src=False``, therefore
50​ there is nothing to download
46version_added: 0.4 51​version_added: 0.4
47""" 52​"""
48 53​
49EXAMPLES = """ 54​EXAMPLES = """
50Download a Bodhi update provided on the command line and then check it with 55​Download a Bodhi update provided on the command line and then check it with
51rpmlint:: 56​rpmlint::
52 57​
53 - name: download update from Bodhi 58​ - name: download update from Bodhi
Show All 28 Lines83 def __init__(self, bodhi_api=None, koji_session=None):
82 else: 87​ else:
83 self.bodhi_api = bodhi.BodhiUtils() 88​ self.bodhi_api = bodhi.BodhiUtils()
84 89​
85 if koji_session: 90​ if koji_session:
86 self.koji_session = koji_session 91​ self.koji_session = koji_session
87 else: 92​ else:
88 self.koji_session = KojiClient() 93​ self.koji_session = KojiClient()
89 94​
90 def action_download(self, update, arches, workdir): 95​ def action_download(self, update, arches, src, workdir):
91 96​
92 res = self.bodhi_api.query_update(update) 97​ res = self.bodhi_api.query_update(update)
93 98​
94 if res is None: 99​ if res is None:
95 raise TaskotronDirectiveError("Update with id '%s' wasn't found" 100​ raise TaskotronDirectiveError("Update with id '%s' wasn't found"
96 % update) 101​ % update)
97 102​
98 nvrs = [build['nvr'] for build in res['builds']] 103​ nvrs = [build['nvr'] for build in res['builds']]
99 104​
100 downloaded_rpms = [] 105​ downloaded_rpms = []
101 106​
102 for nvr in nvrs: 107​ for nvr in nvrs:
103 res = self.koji_session.get_nvr_rpms(nvr, workdir, arches) 108​ res = self.koji_session.get_nvr_rpms(nvr, workdir, arches, src=src)
104 downloaded_rpms.extend(res) 109​ downloaded_rpms.extend(res)
105 110​
106 return downloaded_rpms 111​ return downloaded_rpms
107 112​
108 def process(self, input_data, env_data): 113​ def process(self, input_data, env_data):
109 output_data = {} 114​ output_data = {}
110 115​
111 valid_actions = ['download'] 116​ valid_actions = ['download']
Show All 12 Lines127 raise TaskotronDirectiveError("The bodhi directive 'download'"
124 " 'arch' arguments. Detected arguments: %s" % detected_args) 129​ " 'arch' arguments. Detected arguments: %s" % detected_args)
125 130​
126 workdir = env_data['workdir'] 131​ workdir = env_data['workdir']
127 update = input_data['bodhi_id'] 132​ update = input_data['bodhi_id']
128 if 'all' in input_data['arch']: 133​ if 'all' in input_data['arch']:
129 arches = Arches.base + ['noarch'] 134​ arches = Arches.base + ['noarch']
130 else: 135​ else:
131 arches = input_data['arch'] 136​ arches = input_data['arch']
132 if 'noarch' not in arches and arches != ['src']: 137​ if arches and ('noarch' not in arches):
133 arches.append('noarch') 138​ arches.append('noarch')
134 139​
140​ src = input_data.get('src', False)
141​
135 log.info("getting rpms for update %s (%s) and downloading to %s", 142​ log.info("getting rpms for update %s (%s) and downloading to %s",
136 update, arches, workdir) 143​ update, arches, workdir)
137 144​
138 output_data['downloaded_rpms'] = self.action_download(update, arches, workdir) 145​ output_data['downloaded_rpms'] = self.action_download(update, arches, src, workdir)
kparalUnsubmitted
Not Done

This should not be needed, the error is thrown by koji_utils.py when used in action_download().

139 146​
140 return output_data 147​ return output_data
View Options

testing/test_bodhi_directive.py

1# -*- coding: utf-8 -*- 1​# -*- coding: utf-8 -*-
2# Copyright 2009-2014, Red Hat, Inc. 2​# Copyright 2009-2014, Red Hat, Inc.
3# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+> 3​# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+>
4# See the LICENSE file for more details on Licensing 4​# See the LICENSE file for more details on Licensing
5 5​
6'''Unit tests for libtaskotron/directives/bodhi_directive.py''' 6​'''Unit tests for libtaskotron/directives/bodhi_directive.py'''
7 7​
8import pytest 8​import pytest
9from dingus import Dingus 9​from dingus import Dingus
10 10​
11from libtaskotron.directives import bodhi_directive 11​from libtaskotron.directives import bodhi_directive
12from libtaskotron.exceptions import TaskotronDirectiveError 12​from libtaskotron.exceptions import TaskotronDirectiveError, TaskotronValueError
13 13​
14class TestBodhiDownloads(): 14​class TestBodhiDownloads():
15 15​
16 def setup_method(self, method): 16​ def setup_method(self, method):
17 '''Run this before every test invocation''' 17​ '''Run this before every test invocation'''
18 self.ref_arch = ['x86_64'] 18​ self.ref_arch = ['x86_64']
19 self.ref_bodhi_id = 'FEDORA-1234-56789' 19​ self.ref_bodhi_id = 'FEDORA-1234-56789'
20 self.ref_workdir = '/var/tmp/foo' 20​ self.ref_workdir = '/var/tmp/foo'
▲ Show 20 Lines • Show All 56 Lines • ▼ Show 20 Line(s)61 def test_action_download_all_archs(self):
77 getrpms_calls = stub_koji.calls() 77​ getrpms_calls = stub_koji.calls()
78 req_arches = map(lambda x: x[1][2], getrpms_calls) 78​ req_arches = map(lambda x: x[1][2], getrpms_calls)
79 79​
80 # checks whether all get_nvr_rpms calls demanded all arches 80​ # checks whether all get_nvr_rpms calls demanded all arches
81 assert all(map(lambda x: set(x) == ref_arches, req_arches)) 81​ assert all(map(lambda x: set(x) == ref_arches, req_arches))
82 82​
83 def test_action_download_source(self): 83​ def test_action_download_source(self):
84 '''Test download of source packages''' 84​ '''Test download of source packages'''
85 self.ref_arch = ['src'] 85​ self.ref_arch = []
86 self.ref_input = {'action': 'download', 86​ self.ref_input = {'action': 'download',
87 'arch': self.ref_arch, 87​ 'arch': self.ref_arch,
88 'bodhi_id': self.ref_bodhi_id 88​ 'bodhi_id': self.ref_bodhi_id,
89​ 'src': True
89 } 90​ }
90 91​
91 stub_bodhi = Dingus(query_update__returns = self.ref_update) 92​ stub_bodhi = Dingus(query_update__returns = self.ref_update)
92 stub_koji = Dingus(get_nvr_rpms__returns = [self.ref_rpmfile]) 93​ stub_koji = Dingus(get_nvr_rpms__returns = [self.ref_rpmfile])
93 94​
94 test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji) 95​ test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji)
95 96​
96 test_bodhi.process(self.ref_input, self.ref_envdata) 97​ test_bodhi.process(self.ref_input, self.ref_envdata)
97 98​
98 getrpms_calls = stub_koji.calls() 99​ getrpm_calls = stub_koji.calls()
99 req_arches = map(lambda x: x[1][2], getrpms_calls) ​
100 100​
101 # checks whether all get_nvr_rpms calls demanded only source pkgs 101​ # checks whether all get_nvr_rpms calls demanded only source pkgs
102 assert all(map(lambda x: x == ['src'], req_arches)) 102​ assert all(map(lambda x: x[1][2] == [], getrpm_calls))
103​ assert all(map(lambda x: x[2]['src'], getrpm_calls))
103 104​
104 def test_action_download_multiple_arch(self): 105​ def test_action_download_multiple_arch(self):
105 '''Test download of multiple arches packages''' 106​ '''Test download of multiple arches packages'''
106 self.ref_arch = ['x86_64', 'noarch'] 107​ self.ref_arch = ['x86_64', 'noarch']
107 self.ref_input = {'action': 'download', 108​ self.ref_input = {'action': 'download',
108 'arch': self.ref_arch, 109​ 'arch': self.ref_arch,
109 'bodhi_id': self.ref_bodhi_id 110​ 'bodhi_id': self.ref_bodhi_id
110 } 111​ }
▲ Show 20 Lines • Show All 79 Lines • ▼ Show 20 Line(s)175 def test_action_download_insufficient_input_data(self):
190 with pytest.raises(TaskotronDirectiveError): 191​ with pytest.raises(TaskotronDirectiveError):
191 test_bodhi.process(ref_input, self.ref_envdata) 192​ test_bodhi.process(ref_input, self.ref_envdata)
192 193​
193 ref_input.pop('arch') 194​ ref_input.pop('arch')
194 ref_input['bodhi_id'] = self.ref_bodhi_id 195​ ref_input['bodhi_id'] = self.ref_bodhi_id
195 196​
196 with pytest.raises(TaskotronDirectiveError): 197​ with pytest.raises(TaskotronDirectiveError):
197 test_bodhi.process(ref_input, self.ref_envdata) 198​ test_bodhi.process(ref_input, self.ref_envdata)
199​
200​ def test_empty_arch_no_src(self):
201​ self.ref_arch = []
202​ self.ref_input = {'action': 'download',
203​ 'arch': self.ref_arch,
204​ 'bodhi_id': self.ref_bodhi_id,
205​ 'src': False
206​ }
207​
208​ stub_bodhi = Dingus(query_update__returns=self.ref_update)
209​ stub_koji = Dingus(get_nvr_rpms__returns=[self.ref_rpmfile])
210​
211​ test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji)
212​
213​ with pytest.raises(TaskotronValueError):
214​ test_bodhi.process(self.ref_input, self.ref_envdata)
215​No newline at end of file
View Options

testing/test_koji_directive.py

1# -*- coding: utf-8 -*- 1​# -*- coding: utf-8 -*-
2# Copyright 2009-2014, Red Hat, Inc. 2​# Copyright 2009-2014, Red Hat, Inc.
3# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+> 3​# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+>
4# See the LICENSE file for more details on Licensing 4​# See the LICENSE file for more details on Licensing
5 5​
6from dingus import Dingus 6​from dingus import Dingus
7​import pytest
7 8​
8from libtaskotron.directives import koji_directive 9​from libtaskotron.directives import koji_directive
10​from libtaskotron.exceptions import TaskotronValueError
9 11​
10class TestKojiDirective(): 12​class TestKojiDirective():
11 def setup_method(self, method): 13​ def setup_method(self, method):
12 self.ref_nvr = 'foo-1.2-3.fc99' 14​ self.ref_nvr = 'foo-1.2-3.fc99'
13 self.ref_arch = ['noarch'] 15​ self.ref_arch = ['noarch']
14 self.ref_tag = 'tagfoo' 16​ self.ref_tag = 'tagfoo'
15 self.ref_name = 'foo' 17​ self.ref_name = 'foo'
16 self.ref_version = '1.2' 18​ self.ref_version = '1.2'
▲ Show 20 Lines • Show All 114 Lines • ▼ Show 20 Line(s)125 def test_add_noarch_download_tag_command(self):
131 133​
132 getrpm_calls = stub_koji.calls() 134​ getrpm_calls = stub_koji.calls()
133 requested_arches = getrpm_calls[0][2]['arches'] 135​ requested_arches = getrpm_calls[0][2]['arches']
134 136​
135 assert len(getrpm_calls) == 1 137​ assert len(getrpm_calls) == 1
136 assert 'x86_64' in requested_arches 138​ assert 'x86_64' in requested_arches
137 assert 'noarch' in requested_arches 139​ assert 'noarch' in requested_arches
138 140​
141​ def test_empty_arch_no_src(self):
142​ ref_input = {'action': 'download', 'arch': [], 'src': False,
143​ 'koji_build': self.ref_nvr}
144​ ref_envdata = {'workdir': '/var/tmp/foo'}
145​
146​ stub_koji = Dingus()
147​ test_helper = koji_directive.KojiDirective(stub_koji)
148​ with pytest.raises(TaskotronValueError):
149​ test_helper.process(ref_input, ref_envdata)
150​
139 def test__download_command_src(self): 151​ def test__download_command_src(self):
140 ref_input = {'action': 'download', 'arch': [], 'src': True, 152​ ref_input = {'action': 'download', 'arch': [], 'src': True,
141 'koji_build': self.ref_nvr} 153​ 'koji_build': self.ref_nvr}
142 ref_envdata = {'workdir': '/var/tmp/foo'} 154​ ref_envdata = {'workdir': '/var/tmp/foo'}
143 155​
144 stub_koji = Dingus() 156​ stub_koji = Dingus()
145 test_helper = koji_directive.KojiDirective(stub_koji) 157​ test_helper = koji_directive.KojiDirective(stub_koji)
146 test_helper.process(ref_input, ref_envdata) 158​ test_helper.process(ref_input, ref_envdata)
147 159​
148 getrpm_calls = stub_koji.calls() 160​ getrpm_calls = stub_koji.calls()
149 requested_arches = getrpm_calls[0][2]['arches'] 161​ requested_arches = getrpm_calls[0][2]['arches']
150 requested_src = getrpm_calls[0][2]['src'] 162​ requested_src = getrpm_calls[0][2]['src']
151 163​
152 assert len(getrpm_calls) == 1 164​ assert len(getrpm_calls) == 1
153 assert [] == requested_arches 165​ assert [] == requested_arches
154 assert requested_src 166​ assert requested_src