Differential D1076

Use supported arches when downloading build logs
ClosedPublic
Actions

Authored by kparal on Jan 4 2017, 3:31 PM.

Details

Reviewers
tflink
mkrizek
Group Reviewers
libtaskotron
Commits
rLTRN4c71982cd28a: koji_utils: use supported arches when downloading build logs
Summary

Some of the rpmgrill runs (e.g. [1]) started to fail with

'build.log.aarch64' -> 'unpacked/aarch64/build.log'
mv: cannot move 'build.log.aarch64' to 'unpacked/aarch64/build.log': No such file or directory

Turned out we forgot to change the method that downloads koji build logs to work with supported_archs. This patch fixes that.

[1] http://taskotron-dev.fedoraproject.org/taskmaster/builders/x86_64/builds/280195

Test Plan

runtask -i otter-browser-0.9.12-0.1.beta12git90e17b8.fc26 -t koji_build -a x86_64 -j x86_64/280195 --uuid 7cd178c8-d18e-11e6-85b9-525400cb0b45 task-rpmgrill/runtask.yml

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.
mkrizek retitled this revision from to Use supported arches when downloading build logs.Jan 4 2017, 3:31 PM
mkrizek updated this object.
mkrizek edited the test plan for this revision. (Show Details)
mkrizek added a reviewer: libtaskotron.
mkrizek edited the test plan for this revision. (Show Details)Jan 5 2017, 8:50 AM
mkrizek edited the test plan for this revision. (Show Details)Jan 5 2017, 2:19 PM
tflink added a comment.Jan 6 2017, 1:33 AM

The code looks good to me but I'd like to see some unit tests to cover the changes

kparal added a comment.Jan 6 2017, 8:08 AM

I'll provide a slightly tweak version, Martin, if you don't mind. I'll also cover the unit tests changes. I've worked on that code recently so I still remember it fairly well.

kparal commandeered this revision.Jan 6 2017, 4:32 PM
kparal edited reviewers, added: mkrizek; removed: kparal.
kparal updated this revision to Diff 2739.Jan 6 2017, 4:35 PM
  • make _compute_arches static, redo unit tests

Extracting the arch code into a separate method made the unit tests so much easier. Great job, Martin. What about this? I renamed it a little, made it static (because it does not need self), moved a bunch of unit tests and simplified them a lot. I don't think new unit tests are needed, since we weren't using a shared method and now we do, there's no real change in functionality in the affected methods.

mkrizek accepted this revision.Jan 6 2017, 6:25 PM
This revision is now accepted and ready to land.Jan 6 2017, 6:25 PM
tflink accepted this revision.Jan 10 2017, 5:59 AM
tflink added a reviewer: tflink.
Closed by commit rLTRN4c71982cd28a: koji_utils: use supported arches when downloading build logs (authored by Martin Krizek <mkrizek@redhat.com>, committed by Kamil Páral <kparal@redhat.com>). · Explain WhyJan 11 2017, 5:32 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 2744

View Options

libtaskotron/ext/fedora/koji_utils.py

Show First 20 Lines • Show All 139 Lines • ▼ Show 20 Line(s)80 def rpms_to_build(self, rpms):
140 build_to_buildinfo = dict(zip(builds, buildinfos)) 140​ build_to_buildinfo = dict(zip(builds, buildinfos))
141 result = [] 141​ result = []
142 for rpminfo in rpminfos: 142​ for rpminfo in rpminfos:
143 build_id = rpminfo[0]['build_id'] 143​ build_id = rpminfo[0]['build_id']
144 result.append(build_to_buildinfo[build_id][0]) 144​ result.append(build_to_buildinfo[build_id][0])
145 145​
146 return result 146​ return result
147 147​
148​ @staticmethod
149​ def _compute_arches(arches, arch_exclude, src):
150​ '''
151​ From requested arches compute a final list of arches to be used by Koji calls.
152​ The input parameters have the same meaning as documented in :meth:`nvr_to_urls`.
153​
154​ :return: a set of arches to be used
155​ :rtype: set of str
156​ '''
157​ arches = set(arches)
158​ arch_exclude = set(arch_exclude)
159​ # populate arches if 'all' requested
160​ if 'all' in arches:
161​ arches.discard('all')
162​ arches.update(config.get_config().supported_arches + ['noarch'])
163​
164​ # add binary arches if base arches are specified
165​ for arch in arches.copy():
166​ if arch in arch_utils.Arches.base:
167​ arches.update(arch_utils.Arches.binary[arch])
168​
169​ if src:
170​ arches.add('src')
171​ else:
172​ arch_exclude.add('src')
173​
174​ # exclude unwanted arches
175​ arches.difference_update(arch_exclude)
176​
177​ return arches
178​
148 def nvr_to_urls(self, nvr, arches=['all'], arch_exclude=[], debuginfo=False, src=True): 179​ def nvr_to_urls(self, nvr, arches=['all'], arch_exclude=[], debuginfo=False, src=True):
149 '''Get list of URLs for RPMs corresponding to a build. 180​ '''Get list of URLs for RPMs corresponding to a build.
150 181​
151 :param str nvr: build NVR 182​ :param str nvr: build NVR
152 :param arches: restrict the arches of builds to provide URLs for. By default, all 183​ :param arches: restrict the arches of builds to provide URLs for. By default, all
153 Taskotron-supported architectures are considered. If you want to consider just some 184​ Taskotron-supported architectures are considered. If you want to consider just some
154 selected arches, provide their names in a list. 185​ selected arches, provide their names in a list.
155 186​
156 .. note:: If you specify base arches (like ``i386``), all concrete binary arches for 187​ .. note:: If you specify base arches (like ``i386``), all concrete binary arches for
157 that base arch will be automatically added (e.g. ``i[3-6]86``), because Koji query 188​ that base arch will be automatically added (e.g. ``i[3-6]86``), because Koji query
158 requires concrete binary arches. 189​ requires concrete binary arches.
159 :type arches: list of str 190​ :type arches: list of str
160 :param arch_exclude: exclude some specific arches, even if they are specified in 191​ :param arch_exclude: exclude some specific arches, even if they are specified in
161 ``arches`` or they are implicit in the default ``'all'`` value 192​ ``arches`` or they are implicit in the default ``'all'`` value
162 :type arch_exclude: list of str 193​ :type arch_exclude: list of str
163 :param bool debuginfo: whether to provide URLs for debuginfo RPM files 194​ :param bool debuginfo: whether to provide URLs for debuginfo RPM files
164 or ignore them 195​ or ignore them
165 :param bool src: whether to include a URL for the source RPM 196​ :param bool src: whether to include a URL for the source RPM
166 :rtype: list of str 197​ :rtype: list of str
167 :raise TaskotronRemoteError: when the requested build doesn't exist 198​ :raise TaskotronRemoteError: when the requested build doesn't exist
168 ''' 199​ '''
169 log.info('Querying Koji for a list of RPMS for: %s', nvr) 200​ log.info('Querying Koji for a list of RPMS for: %s', nvr)
170 201​
171 arches = set(arches) 202​ arches = list(self._compute_arches(arches, arch_exclude, src))
172 # populate arches if 'all' requested ​
173 if 'all' in arches: ​
174 arches.discard('all') ​
175 arches.update(config.get_config().supported_arches + ['noarch']) ​
176 203​
177 # add binary arches if base arches are specified ​
178 for arch in arches.copy(): ​
179 if arch in arch_utils.Arches.base: ​
180 arches.update(arch_utils.Arches.binary[arch]) ​
181 ​
182 if src: ​
183 arches.add('src') ​
184 ​
185 # exclude unwanted arches ​
186 arches.difference_update(set(arch_exclude)) ​
187 ​
188 arches = list(arches) ​
189 if not arches: 204​ if not arches:
190 log.debug('Nothing to query for, the combination of `arches`, `arch_exclude` and ' 205​ log.debug('Nothing to query for, the combination of `arches`, `arch_exclude` and '
191 '`src` ended up an empty list.') 206​ '`src` ended up an empty list.')
192 return [] 207​ return []
193 208​
194 # find the koji build 209​ # find the koji build
195 info = self.session.getBuild(nvr) 210​ info = self.session.getBuild(nvr)
196 if info is None: 211​ if info is None:
▲ Show 20 Lines • Show All 98 Lines • ▼ Show 20 Line(s)304 :return: a dictionary of this structure:
295 310​
296 which describes which build logs were correctly downloaded and for which architectures 311​ which describes which build logs were correctly downloaded and for which architectures
297 we failed to download the logs. 312​ we failed to download the logs.
298 :rtype: dict 313​ :rtype: dict
299 :raise TaskotronRemoteError: when the requested build doesn't exist or its info can't be 314​ :raise TaskotronRemoteError: when the requested build doesn't exist or its info can't be
300 retrieved 315​ retrieved
301 ''' 316​ '''
302 log.info('Getting build logs for: %s', nvr) 317​ log.info('Getting build logs for: %s', nvr)
303 arch_exclude = list(arch_exclude) ​
304 318​
305 # add binary arches if base arches are specified ​
306 archlist = list(arches) ​
307 for arch in arches: ​
308 if arch in arch_utils.Arches.base: ​
309 archlist.extend(arch_utils.Arches.binary[arch]) ​
310 arches = list(set(archlist)) ​
311 # there seem to be no logs in Koji for 'src' 319​ # there seem to be no logs in Koji for 'src'
312 arch_exclude.append('src') 320​ arches = self._compute_arches(arches, arch_exclude, src=False)
321​ if not arches:
322​ log.debug('Nothing to query for, the combination of `arches` and `arch_exclude` ended '
323​ 'up an empty list.')
324​ return {'ok': [], 'error': []}
313 325​
314 # list the RPMs for the koji build, so that we know which arches to download logs for 326​ # list the RPMs for the koji build, so that we know which arches to download logs for
315 try: 327​ try:
316 build_rpms = self.session.listBuildRPMs(nvr) 328​ build_rpms = self.session.listBuildRPMs(nvr)
317 except koji.GenericError as e: 329​ except koji.GenericError as e:
318 log.exception("Could not query build %s: %s", nvr, e) 330​ log.exception("Could not query build %s: %s", nvr, e)
319 raise exc.TaskotronRemoteError(e) 331​ raise exc.TaskotronRemoteError(e)
320 332​
321 # download for each arch 333​ # download for each arch
322 build_arches = set([rpm['arch'] for rpm in build_rpms]) 334​ build_arches = set([rpm['arch'] for rpm in build_rpms])
335​ build_arches.intersection_update(arches)
323 ok = [] 336​ ok = []
324 error = [] 337​ error = []
325 for build_arch in build_arches: 338​ for build_arch in build_arches:
326 if build_arch not in arches and 'all' not in arches: ​
327 continue ​
328 if build_arch in arch_exclude: ​
329 continue ​
330 nevra = hawkey.split_nevra(nvr + '.' + build_arch) 339​ nevra = hawkey.split_nevra(nvr + '.' + build_arch)
331 url = self.build_log_url.format(pkg_url=config.get_config().pkg_url, nevra=nevra) 340​ url = self.build_log_url.format(pkg_url=config.get_config().pkg_url, nevra=nevra)
332 341​
333 log.debug('Getting build.log for: %s %s', nvr, build_arch) 342​ log.debug('Getting build.log for: %s %s', nvr, build_arch)
334 try: 343​ try:
335 log_file = file_utils.download(url=url, dirname=dest, 344​ log_file = file_utils.download(url=url, dirname=dest,
336 filename='build.log.' + build_arch) 345​ filename='build.log.' + build_arch)
337 except exc.TaskotronRemoteError: 346​ except exc.TaskotronRemoteError:
Show All 29 Lines
View Options

testing/test_koji_utils.py

Show All 10 Lines
11import itertools 11​import itertools
12import mock 12​import mock
13import koji 13​import koji
14 14​
15from libtaskotron.ext.fedora import koji_utils 15​from libtaskotron.ext.fedora import koji_utils
16from libtaskotron import exceptions as exc 16​from libtaskotron import exceptions as exc
17from libtaskotron import config 17​from libtaskotron import config
18from libtaskotron import file_utils 18​from libtaskotron import file_utils
19​from libtaskotron import arch_utils
19 20​
20from test_file_utils import mock_download 21​from test_file_utils import mock_download
21 22​
22# http://stackoverflow.com/questions/3190706/nonlocal-keyword-in-python-2-x 23​# http://stackoverflow.com/questions/3190706/nonlocal-keyword-in-python-2-x
23def create_multicall(first, second): 24​def create_multicall(first, second):
24 first_call = {"value": True} 25​ first_call = {"value": True}
25 26​
26 def multicall(): 27​ def multicall():
▲ Show 20 Lines • Show All 126 Lines • ▼ Show 20 Line(s)153 stub_koji = Dingus(getBuild__returns=None,
153 getRPM__returns=None, 154​ getRPM__returns=None,
154 multiCall=create_multicall([[self.ref_rpms[0]]], 155​ multiCall=create_multicall([[self.ref_rpms[0]]],
155 [[None]])) 156​ [[None]]))
156 157​
157 test_koji = koji_utils.KojiClient(stub_koji) 158​ test_koji = koji_utils.KojiClient(stub_koji)
158 with pytest.raises(exc.TaskotronRemoteError): 159​ with pytest.raises(exc.TaskotronRemoteError):
159 test_koji.rpms_to_build([self.ref_filename]) 160​ test_koji.rpms_to_build([self.ref_filename])
160 161​
162​ # =====================
163​ # _compute_arches()
164​ # =====================
165​
166​ def test_add_binary_arches(self):
167​ '''specifying basearch should add all binary arches'''
168​ ref_arch = 'i386'
169​ bin_arches = arch_utils.Arches.binary[ref_arch]
170​ arches = koji_utils.KojiClient._compute_arches(arches=[ref_arch], arch_exclude=[],
171​ src=False)
172​ assert arches == set(bin_arches)
173​
174​ def test_keep_extra_arch_with_all(self):
175​ '''Arches should not be thrown away even if 'all' is specified (there might be some extra
176​ obscure arches specified in addition)'''
177​ ref_arch = ['all', 'obscure_arch']
178​ arches = koji_utils.KojiClient._compute_arches(arches=ref_arch, arch_exclude=[], src=False)
179​ assert 'all' not in arches
180​ assert 'obscure_arch' in arches
181​
182​ def test_src(self):
183​ # src enabled
184​ ref_arch = ['all']
185​ arches = koji_utils.KojiClient._compute_arches(arches=ref_arch, arch_exclude=[], src=True)
186​ assert 'src' in arches
187​
188​ # src disabled
189​ ref_arch = ['all', 'src']
190​ arches = koji_utils.KojiClient._compute_arches(arches=ref_arch, arch_exclude=[], src=False)
191​ assert 'src' not in arches
192​
193​ def test_only_src(self):
194​ ref_arch = []
195​ arches = koji_utils.KojiClient._compute_arches(arches=ref_arch, arch_exclude=[], src=True)
196​ assert arches == set(['src'])
197​
198​ def test_arch_exclude(self):
199​ ref_arch = ['all']
200​
201​ # arch_exclude disabled
202​ ref_exclude = []
203​ arches = koji_utils.KojiClient._compute_arches(arches=ref_arch, arch_exclude=ref_exclude,
204​ src=False)
205​ for arch in ref_exclude:
206​ if arch in config.get_config().supported_arches:
207​ assert arch in arches
208​
209​ # arch_exclude enabled
210​ ref_exclude = ['x86_64']
211​ arches = koji_utils.KojiClient._compute_arches(arches=ref_arch, arch_exclude=ref_exclude,
212​ src=False)
213​ for arch in ref_exclude:
214​ assert arch not in arches
215​
216​ def test_arch_exclude_override_explicit(self):
217​ '''arch_exclude should work even when the same arch is explicitly stated in arches'''
218​ ref_exclude = ['x86_64']
219​ ref_arch = ref_exclude + ['i386']
220​
221​ arches = koji_utils.KojiClient._compute_arches(arches=ref_arch, arch_exclude=ref_exclude,
222​ src=False)
223​ for arch in ref_exclude:
224​ assert arch not in arches
225​
161 # =================== 226​ # ===================
162 # nvr_to_urls() 227​ # nvr_to_urls()
163 # =================== 228​ # ===================
164 229​
165 def test_get_urls(self): 230​ def test_get_urls(self):
166 stub_koji = Dingus(getBuild__returns=self.ref_build, 231​ stub_koji = Dingus(getBuild__returns=self.ref_build,
167 listRPMs__returns=self.ref_rpms) 232​ listRPMs__returns=self.ref_rpms)
168 test_koji = koji_utils.KojiClient(stub_koji) 233​ test_koji = koji_utils.KojiClient(stub_koji)
169 koji_baseurl = config.get_config().pkg_url 234​ koji_baseurl = config.get_config().pkg_url
170 235​
171 test_urls = test_koji.nvr_to_urls(self.ref_nvr) 236​ test_urls = test_koji.nvr_to_urls(self.ref_nvr)
172 for url in test_urls: 237​ for url in test_urls:
173 assert url.startswith(koji_baseurl) 238​ assert url.startswith(koji_baseurl)
174 assert url.endswith('.rpm') 239​ assert url.endswith('.rpm')
175 240​
176 def should_i386_rpmurls_query_i686(self): ​
177 self.ref_arch = 'i386' ​
178 stub_koji = Dingus(getBuild__returns=self.ref_build, ​
179 listRPMs__returns=self.ref_rpms) ​
180 test_koji = koji_utils.KojiClient(stub_koji) ​
181 ​
182 test_koji.nvr_to_urls(self.ref_nvr, arches=[self.ref_arch]) ​
183 ​
184 listrpm_calls = stub_koji.calls('listRPMs') ​
185 requested_arches = listrpm_calls[0][2]['arches'] ​
186 assert 'i686' in requested_arches ​
187 assert 'i386' in requested_arches ​
188 ​
189 def test_keep_extra_arch_with_all(self): ​
190 '''Arches should not be thrown away even if 'all' is specified (there might be some extra ​
191 obscure arches specified in addition)''' ​
192 self.ref_arch = ['all', 'obscure_arch'] ​
193 stub_koji = Dingus(getBuild__returns=self.ref_build) ​
194 test_koji = koji_utils.KojiClient(stub_koji) ​
195 ​
196 test_koji.nvr_to_urls(self.ref_nvr, arches=self.ref_arch) ​
197 ​
198 listrpm_calls = stub_koji.calls('listRPMs') ​
199 requested_arches = listrpm_calls[0][2]['arches'] ​
200 assert 'all' not in requested_arches ​
201 assert 'obscure_arch' in requested_arches ​
202 ​
203 def should_not_throw_exception_norpms(self): 241​ def should_not_throw_exception_norpms(self):
204 '''It's possible to have no RPMs (for the given arch) in a build''' 242​ '''It's possible to have no RPMs (for the given arch) in a build'''
205 stub_koji = Dingus(getBuild__returns = self.ref_build) 243​ stub_koji = Dingus(getBuild__returns = self.ref_build)
206 test_koji = koji_utils.KojiClient(stub_koji) 244​ test_koji = koji_utils.KojiClient(stub_koji)
207 245​
208 test_koji.nvr_to_urls(self.ref_nvr, arches = [self.ref_arch]) 246​ test_koji.nvr_to_urls(self.ref_nvr, arches = [self.ref_arch])
209 247​
210 def test_nvr_to_urls_src_filtering(self): ​
211 stub_koji = Dingus(getBuild__returns=self.ref_build) ​
212 test_koji = koji_utils.KojiClient(stub_koji) ​
213 ​
214 # src enabled ​
215 test_koji.nvr_to_urls(self.ref_nvr, src=True, debuginfo=True) ​
216 listrpm_calls = stub_koji.calls('listRPMs') ​
217 assert len(listrpm_calls) == 1 ​
218 requested_arches = listrpm_calls[0][2]['arches'] ​
219 assert 'src' in requested_arches ​
220 ​
221 # src disabled ​
222 test_koji.nvr_to_urls(self.ref_nvr, src=False, debuginfo=True) ​
223 listrpm_calls = stub_koji.calls('listRPMs') ​
224 assert len(listrpm_calls) == 2 ​
225 requested_arches = listrpm_calls[1][2]['arches'] ​
226 assert 'src' not in requested_arches ​
227 ​
228 def test_nvr_to_urls_debuginfo(self): 248​ def test_nvr_to_urls_debuginfo(self):
229 stub_koji = Dingus(getBuild__returns=self.ref_build, 249​ stub_koji = Dingus(getBuild__returns=self.ref_build,
230 listRPMs__returns=self.ref_rpms) 250​ listRPMs__returns=self.ref_rpms)
231 test_koji = koji_utils.KojiClient(stub_koji) 251​ test_koji = koji_utils.KojiClient(stub_koji)
232 252​
233 # debuginfo enabled 253​ # debuginfo enabled
234 urls = test_koji.nvr_to_urls(self.ref_nvr, debuginfo=True) 254​ urls = test_koji.nvr_to_urls(self.ref_nvr, debuginfo=True)
235 assert len(urls) == len(self.ref_rpms) 255​ assert len(urls) == len(self.ref_rpms)
236 assert any(['debuginfo' in url for url in urls]) 256​ assert any(['debuginfo' in url for url in urls])
237 257​
238 # debuginfo disabled 258​ # debuginfo disabled
239 urls = test_koji.nvr_to_urls(self.ref_nvr, debuginfo=False) 259​ urls = test_koji.nvr_to_urls(self.ref_nvr, debuginfo=False)
240 assert len(urls) == len([rpm for rpm in self.ref_rpms 260​ assert len(urls) == len([rpm for rpm in self.ref_rpms
241 if 'debuginfo' not in rpm['name']]) 261​ if 'debuginfo' not in rpm['name']])
242 assert all(['debuginfo' not in url for url in urls]) 262​ assert all(['debuginfo' not in url for url in urls])
243 263​
244 def test_nvr_to_urls_only_src(self): ​
245 stub_koji = Dingus(getBuild__returns=self.ref_build) ​
246 test_koji = koji_utils.KojiClient(stub_koji) ​
247 ​
248 # arch disabled, src enabled ​
249 test_koji.nvr_to_urls(self.ref_nvr, arches=[], src=True) ​
250 listrpm_calls = stub_koji.calls('listRPMs') ​
251 requested_arches = listrpm_calls[0][2]['arches'] ​
252 assert len(requested_arches) == 1 ​
253 assert 'src' in requested_arches ​
254 ​
255 def should_not_query_no_arch_no_src(self): 264​ def should_not_query_no_arch_no_src(self):
256 '''If there's no arch to query for, should not perform the query''' 265​ '''If there's no arch to query for, should not perform the query'''
257 stub_koji = mock.Mock() 266​ stub_koji = mock.Mock()
258 test_koji = koji_utils.KojiClient(stub_koji) 267​ test_koji = koji_utils.KojiClient(stub_koji)
259 268​
260 test_koji.nvr_to_urls(self.ref_nvr, arches=[], src=False) 269​ test_koji.nvr_to_urls(self.ref_nvr, arches=[], src=False)
261 assert not stub_koji.called 270​ assert not stub_koji.called
262 271​
263 def test_arch_exclude(self): ​
264 stub_koji = Dingus(getBuild__returns=self.ref_build) ​
265 test_koji = koji_utils.KojiClient(stub_koji) ​
266 ref_exclude = ['x86_64'] ​
267 ​
268 # arch_exclude disabled ​
269 test_koji.nvr_to_urls(self.ref_nvr, src=True, debuginfo=True) ​
270 listrpm_calls = stub_koji.calls('listRPMs') ​
271 assert len(listrpm_calls) == 1 ​
272 requested_arches = listrpm_calls[0][2]['arches'] ​
273 for arch in ref_exclude: ​
274 if arch in config.get_config().supported_arches: ​
275 assert arch in requested_arches ​
276 ​
277 # arch_exclude enabled ​
278 test_koji.nvr_to_urls(self.ref_nvr, arch_exclude=ref_exclude, src=True, debuginfo=True) ​
279 listrpm_calls = stub_koji.calls('listRPMs') ​
280 assert len(listrpm_calls) == 2 ​
281 requested_arches = listrpm_calls[1][2]['arches'] ​
282 for arch in ref_exclude: ​
283 assert arch not in requested_arches ​
284 ​
285 def test_arch_exclude_override_explicit(self): ​
286 '''arch_exclude should work even when the same arch is explicitly stated in arches''' ​
287 stub_koji = Dingus(getBuild__returns=self.ref_build) ​
288 test_koji = koji_utils.KojiClient(stub_koji) ​
289 ref_exclude = ['x86_64'] ​
290 ref_arch = ref_exclude + ['i386'] ​
291 ​
292 # arch_exclude enabled ​
293 test_koji.nvr_to_urls(self.ref_nvr, arches=ref_arch, arch_exclude=ref_exclude, ​
294 src=True, debuginfo=True) ​
295 listrpm_calls = stub_koji.calls('listRPMs') ​
296 assert len(listrpm_calls) == 1 ​
297 requested_arches = listrpm_calls[0][2]['arches'] ​
298 for arch in ref_exclude: ​
299 assert arch not in requested_arches ​
300 ​
301 # ==================== 272​ # ====================
302 # get_nvr_rpms() 273​ # get_nvr_rpms()
303 # ==================== 274​ # ====================
304 275​
305 def test_get_nvr_rpms_simple(self, monkeypatch): 276​ def test_get_nvr_rpms_simple(self, monkeypatch):
306 '''NVR contains a few RPMs''' 277​ '''NVR contains a few RPMs'''
307 test_koji = koji_utils.KojiClient(Dingus()) 278​ test_koji = koji_utils.KojiClient(Dingus())
308 279​
▲ Show 20 Lines • Show All 120 Lines • ▼ Show 20 Line(s)399 def test_build_log_no_build(self):
429 '''raise error if build info can't be retrieved''' 400​ '''raise error if build info can't be retrieved'''
430 stub_koji = mock.Mock() 401​ stub_koji = mock.Mock()
431 stub_koji.listBuildRPMs.side_effect = koji.GenericError() 402​ stub_koji.listBuildRPMs.side_effect = koji.GenericError()
432 test_koji = koji_utils.KojiClient(stub_koji) 403​ test_koji = koji_utils.KojiClient(stub_koji)
433 404​
434 with pytest.raises(exc.TaskotronRemoteError): 405​ with pytest.raises(exc.TaskotronRemoteError):
435 test_koji.get_build_log(self.ref_nvr, dest=None) 406​ test_koji.get_build_log(self.ref_nvr, dest=None)
436 407​
437 def test_build_log_add_binary_archs(self, monkeypatch): ​
438 '''specifying basearch should query for concrete binary arches''' ​
439 self.ref_arch = 'i686' ​
440 ref_base_arch = 'i386' ​
441 stub_koji = mock.Mock() ​
442 stub_koji.listBuildRPMs.return_value = self.ref_rpms ​
443 test_koji = koji_utils.KojiClient(stub_koji) ​
444 stub_download = mock.Mock() ​
445 monkeypatch.setattr(file_utils, 'download', stub_download) ​
446 ​
447 test_koji.get_build_log(self.ref_nvr, dest=None, arches=[ref_base_arch]) ​
448 ​
449 assert stub_download.call_count == 1 ​
450 assert '/%s/' % self.ref_arch in stub_download.call_args[1]['url'] ​
451 ​
452 def test_build_log_do_nothing_different_arch(self, monkeypatch): 408​ def test_build_log_do_nothing_different_arch(self, monkeypatch):
453 '''if only unavailable arches are requested, do nothing and don't crash''' 409​ '''if only unavailable arches are requested, do nothing and don't crash'''
454 ref_arch = 'armv7hl' # not available in self.rpms 410​ ref_arch = 'armv7hl' # not available in self.rpms
455 stub_koji = mock.Mock() 411​ stub_koji = mock.Mock()
456 stub_koji.listBuildRPMs.return_value = self.ref_rpms 412​ stub_koji.listBuildRPMs.return_value = self.ref_rpms
457 test_koji = koji_utils.KojiClient(stub_koji) 413​ test_koji = koji_utils.KojiClient(stub_koji)
458 stub_download = mock.Mock() 414​ stub_download = mock.Mock()
459 monkeypatch.setattr(file_utils, 'download', stub_download) 415​ monkeypatch.setattr(file_utils, 'download', stub_download)
▲ Show 20 Lines • Show All 81 Lines • Show Last 20 Lines