libtaskotron/directives/koji_directive.py
124	? Edit: on a second thought, I know what it does, but please use braces to make it obvious on the first glance ;) maybe add to the documentation, that providing `[]` as the `arch` value will just download the `noarch` rpms. Or make sure that an empty list raises `ValueError` (which would make it consistent with the `nvr_to_urls()` method. would it make sense to do some type-checking? Since you obviously require some `MutableSequence`?

libtaskotron/directives/koji_directive.py
124	OK, disregard whatever I have written, it was under the influence of my internal "parsing error" of that if clause. But the braces would still be nice :)

libtaskotron/koji_utils.py
137	Can you be consistent on the nested conditionals - either use parens or not?

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	610	646d3a6		Aug 20 2014, 9:42 AM	★	★
Diff 2	611	646d3a6	- improve docs a bit	Aug 20 2014, 9:47 AM	★	★
Diff 3	613	646d3a6	- make arch parameter mandatory again and use ['all'] to specify all arches	Aug 20 2014, 11:47 AM	★	★
Diff 4	615	646d3a6	- add some brackets to earn another pony	Aug 20 2014, 12:32 PM	★	★
Diff 5	617	646d3a6	- more brackets, more ponies	Aug 20 2014, 2:05 PM	★	★
Diff 6	618	221ecc9	Commit rLTRN06b02772bffe0b804cb7ca44bc2630b9aedfde56	Aug 21 2014, 9:07 AM	★	★

Commit	Tree	Parents	Author	Summary	Date
29c1ee92fb74	c375b5e4a548	6ee11415f327	Kamil Páral	more brackets, more ponies	Aug 20 2014, 2:01 PM
6ee11415f327	b85197e9753b	5ada0c688e09	Kamil Páral	add some brackets to earn another pony	Aug 20 2014, 12:31 PM
5ada0c688e09	d8d4e80c79e5	6d8858fac2d2	Kamil Páral	make arch parameter mandatory again and use ['all'] to specify all arches	Aug 20 2014, 11:46 AM
6d8858fac2d2	bdff57b84dad	5ec594375e4a	Kamil Páral	improve docs a bit	Aug 20 2014, 9:47 AM
5ec594375e4a	9b8b1a48b045	646d3a66dfa2	Kamil Páral	koji_directive: allow to download all arches and add src option (Show More…)	Aug 18 2014, 2:06 PM

Diff 618

libtaskotron/directives/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	from __future__ import absolute_import	5		from __future__ import absolute_import
6		6
7	DOCUMENTATION = """	7		DOCUMENTATION = """
8	module: koji_directive	8		module: koji_directive
9	short_description: download builds and tags from Koji	9		short_description: download builds and tags from Koji
10	description: \|	10		description: \|
11	The koji directive interfaces with `Koji <http://koji.fedoraproject.org/>`_	11		The koji directive interfaces with `Koji <http://koji.fedoraproject.org/>`_
12	to facilitate various Koji actions. You can either download all RPMs from	12		to facilitate various Koji actions. You can either download all RPMs from
13	a specific build, or you can download all RPMs from all builds belonging	13		a specific build, or you can download all RPMs from all builds belonging
14	to a specific Koji tag.	14		to a specific Koji tag.
15	parameters:	15		parameters:
		16		action:
		17		required: true
		18		description: choose whether to download a single build or all builds
		19		belonging to a Koji tag
		20		type: str
		21		choices: [tag, build]
16	arch:	22		arch:
17	required: true	23		required: true
18	description: \|	24		description: \|
19	a list of architectures for which to download RPMs for the requested	25		a list of architectures for which to download RPMs for the requested
20	build/tag. In addition to architectures supported by Taskotron by default,	26		build/tag. If you want to download RPMs for all arches, use ``['all']``.
21	``src`` is supported as well.
22		27
23	Note: ``noarch`` RPMs are always automatically downloaded even when not	28		Note: ``noarch`` RPMs are always automatically downloaded even when not
24	requested, unless ``src`` is the only architecture requested.	29		requested, unless ``arch=[]`` and ``src=True``.
25	type: list of str	30		type: list of str
26	choices: [standard Taskotron architectures, src]	31		choices: [supported architectures, ['all']]
27	command:
28	required: true
29	description: choose whether to download a single build or all builds
30	belonging to a Koji tag
31	type: str
32	choices: [tag, build]
33	koji_build:	32		koji_build:
34	required: true	33		required: true
35	description: \|	34		description: \|
36	N(E)VR of a Koji build to download. Only required when	35		N(E)VR of a Koji build to download. Only required when
37	``command="download"``. Example: ``xchat-2.8.8-21.fc20``	36		``action="download"``. Example: ``xchat-2.8.8-21.fc20``
38	type: str	37		type: str
39	koji_tag:	38		koji_tag:
40	required: true	39		required: true
41	description: \|	40		description: \|
42	name of a Koji tag to download all builds from. Only required when	41		name of a Koji tag to download all builds from. Only required when
43	``command="download_tag"``. Example: ``f20-updates-pending``	42		``action="download_tag"``. Example: ``f20-updates-pending``
44	type: str	43		type: str
		44		src:
		45		required: false
		46		description: download also ``src`` RPM files
		47		type: bool
		48		default: False
45	target_dir:	49		target_dir:
46	required: false	50		required: false
47	description: directory into which to download builds	51		description: directory into which to download builds
48	type: str	52		type: str
49	default: ${workdir}	53		default: ${workdir}
50	returns: \|	54		returns: \|
51	A dictionary containing following items:	55		A dictionary containing following items:
52		56
53	* `downloaded_rpms`: (list of str) a list of local filenames of the downloaded	57		* `downloaded_rpms`: (list of str) a list of local filenames of the downloaded
54	RPMs	58		RPMs
55	raises: \|	59		raises: \|
56	* :class:`.TaskotronRemoteError`: if downloading failed	60		* :class:`.TaskotronRemoteError`: if downloading failed
		61		* :class:`.TaskotronValueError`: if ``arch=[]`` and ``src=False``, therefore
		62		there is nothing to download
57	version_added: 0.4	63		version_added: 0.4
58	"""	64		"""
59		65
60	EXAMPLES = """	66		EXAMPLES = """
61	Rpmlint needs to download a specific build from Koji::	67		Rpmlint needs to download a specific build from Koji, all architectures
		68		including src.rpm::
62		69
63	- name: download rpms from koji	70		- name: download rpms from koji
64	koji:	71		koji:
65	action: download	72		action: download
66	koji_build: ${koji_build}	73		koji_build: ${koji_build}
67	arch: ${arch}	74		arch: ['all']
		75		src: True
68		76
69	Depcheck needs to download all builds in a specific Koji tag::	77		Depcheck needs to download all builds in a specific Koji tag for the current
		78		architecture::
70		79
71	- name: download koji tag	80		- name: download koji tag
72	koji:	81		koji:
73	action: download_tag	82		action: download_tag
74	koji_tag: ${koji_tag}	83		koji_tag: ${koji_tag}
75	arch: ${arch}	84		arch: ${arch}
76	target_dir: ${workdir}/downloaded_tag/	85		target_dir: ${workdir}/downloaded_tag/
77	"""	86		"""
78		87
79	from libtaskotron.koji_utils import KojiClient	88		from libtaskotron.koji_utils import KojiClient
80	from libtaskotron.logger import log
81	from libtaskotron.directives import BaseDirective	89		from libtaskotron.directives import BaseDirective
82	from libtaskotron.exceptions import TaskotronDirectiveError
83	from libtaskotron import rpm_utils	90		from libtaskotron import rpm_utils
		91		import libtaskotron.exceptions as exc
84		92
85	directive_class = 'KojiDirective'	93		directive_class = 'KojiDirective'
86		94
87	class KojiDirective(BaseDirective):	95		class KojiDirective(BaseDirective):
88		96
89	def __init__(self, koji_session=None):	97		def __init__(self, koji_session=None):
90	super(KojiDirective, self).__init__()	98		super(KojiDirective, self).__init__()
91	if koji_session is None:	99		if koji_session is None:
92	self.koji = KojiClient(koji_session)	100		self.koji = KojiClient(koji_session)
93	else:	101		else:
94	self.koji = koji_session	102		self.koji = koji_session
95		103
96	def process(self, input_data, env_data):	104		def process(self, input_data, env_data):
		105		# process params
97	valid_actions = ['download', 'download_tag']	106		valid_actions = ['download', 'download_tag']
98
99	output_data = {}
100
101	action = input_data['action']	107		action = input_data['action']
102
103	if not action in valid_actions:	108		if not action in valid_actions:
104	raise TaskotronDirectiveError('%s is not a valid command for koji '	109		raise exc.TaskotronDirectiveError('%s is not a valid action for koji '
105	'helper' % action)	110		'directive' % action)
106
107	if 'arch' not in input_data:
108	detected_args = ', '.join(input_data.keys())
109	raise TaskotronDirectiveError(
110	"The koji directive requires 'arch' as an argument. Detected"
111	"arguments: %s" % detected_args)
112		111
113	if not 'target_dir' in input_data:	112		if not 'target_dir' in input_data:
114	self.target_dir = env_data['workdir']	113		self.target_dir = env_data['workdir']
115	else:	114		else:
116	self.target_dir = input_data['target_dir']	115		self.target_dir = input_data['target_dir']
117		116
118	self.arches = input_data['arch']	117		if 'arch' not in input_data:
		118		detected_args = ', '.join(input_data.keys())
		119		raise exc.TaskotronDirectiveError(
		120		"The koji directive requires 'arch' as an argument. Detected "
		121		"arguments: %s" % detected_args)
119		122
120	if 'noarch' not in self.arches and not self.arches == ['src']:	123		self.arches = input_data['arch']
		124		if self.arches and ('noarch' not in self.arches):
			jskladanUnsubmitted Not Done ? Edit: on a second thought, I know what it does, but please use braces to make it obvious on the first glance ;) maybe add to the documentation, that providing `[]` as the `arch` value will just download the `noarch` rpms. Or make sure that an empty list raises `ValueError` (which would make it consistent with the `nvr_to_urls()` method. would it make sense to do some type-checking? Since you obviously require some `MutableSequence`?
			jskladanUnsubmitted Not Done OK, disregard whatever I have written, it was under the influence of my internal "parsing error" of that if clause. But the braces would still be nice :)
121	self.arches.append('noarch')	125		self.arches.append('noarch')
122		126
		127		self.src = input_data.get('src', False)
		128
		129		# download files
		130		output_data = {}
		131
123	if action == 'download':	132		if action == 'download':
124	if 'koji_build' not in input_data:	133		if 'koji_build' not in input_data:
125	detected_args = ', '.join(input_data.keys())	134		detected_args = ', '.join(input_data.keys())
126	raise TaskotronDirectiveError(	135		raise exc.TaskotronDirectiveError(
127	"The koji directive requires 'koji_build' for the 'download'"	136		"The koji directive requires 'koji_build' for the 'download' "
128	"action. Detected arguments: %s" % detected_args)	137		"action. Detected arguments: %s" % detected_args)
129		138
130	nvr = rpm_utils.rpmformat(input_data['koji_build'], 'nvr')	139		nvr = rpm_utils.rpmformat(input_data['koji_build'], 'nvr')
131		140
132	log.info("Getting RPMs for koji build %s (%s) and downloading to %s",
133	nvr, str(self.arches), self.target_dir)
134	output_data['downloaded_rpms'] = self.koji.get_nvr_rpms(nvr,	141		output_data['downloaded_rpms'] = self.koji.get_nvr_rpms(nvr,
135	self.target_dir,	142		self.target_dir, arches=self.arches, src=self.src)
136	arches=self.arches,	143
137	src=('src' in self.arches))
138	elif action == 'download_tag':	144		elif action == 'download_tag':
139	if 'koji_tag' not in input_data:	145		if 'koji_tag' not in input_data:
140	detected_args = ', '.join(input_data.keys())	146		detected_args = ', '.join(input_data.keys())
141	raise TaskotronDirectiveError(	147		raise exc.TaskotronDirectiveError(
142	"The koji directive requires 'koji_tag' for the 'download_tag'"	148		"The koji directive requires 'koji_tag' for the 'download_tag' "
143	"action. Detected arguments: %s" % detected_args)	149		"action. Detected arguments: %s" % detected_args)
144		150
145	koji_tag = input_data['koji_tag']	151		koji_tag = input_data['koji_tag']
146		152
147	log.info("Getting koji builds for koji tag '%s', arches '%s' and "
148	"downloading to %s", koji_tag, str(self.arches), self.target_dir)
149	output_data['downloaded_rpms'] = self.koji.get_tagged_rpms(koji_tag,	153		output_data['downloaded_rpms'] = self.koji.get_tagged_rpms(koji_tag,
150	self.target_dir,	154		self.target_dir, arches=self.arches, src=self.src)
151	self.arches)
152		155
153	return output_data	156		return output_data

View Options

libtaskotron/koji_utils.py

Show All 29 Lines		28	def __init__(self, koji_session=None):
30		30
31	:param koji_session: an existing Koji session instance or ``None`` if	31		:param koji_session: an existing Koji session instance or ``None`` if
32	you want a new default session to be created	32		you want a new default session to be created
33	:type koji_session: :class:`koji.ClientSession`	33		:type koji_session: :class:`koji.ClientSession`
34	'''	34		'''
35	self.session = (koji_session or	35		self.session = (koji_session or
36	koji.ClientSession(config.get_config().koji_url))	36		koji.ClientSession(config.get_config().koji_url))
37		37
		38
38	def rpms_to_build(self, rpms):	39		def rpms_to_build(self, rpms):
39	'''Get list of koji build objects for the rpms. Order of koji objects	40		'''Get list of koji build objects for the rpms. Order of koji objects
40	in this list is the same as order of the respective rpm objects.	41		in this list is the same as order of the respective rpm objects.
41		42
42	:param rpms: list of filenames as either ``/my/path/nvr.a.rpm`` or	43		:param rpms: list of filenames as either ``/my/path/nvr.a.rpm`` or
43	``nvr.a.rpm``	44		``nvr.a.rpm``
44	:type rpms: list of str	45		:type rpms: list of str
45	:return: list of Koji buildinfo dictionaries (as returned e.g.	46		:return: list of Koji buildinfo dictionaries (as returned e.g.
▲ Show 20 Lines • Show All 54 Lines • ▼ Show 20 Line(s)
100	build_to_buildinfo = dict(zip(builds, buildinfos))	101		build_to_buildinfo = dict(zip(builds, buildinfos))
101	result = []	102		result = []
102	for rpminfo in rpminfos:	103		for rpminfo in rpminfos:
103	build_id = rpminfo[0]['build_id']	104		build_id = rpminfo[0]['build_id']
104	result.append(build_to_buildinfo[build_id][0])	105		result.append(build_to_buildinfo[build_id][0])
105		106
106	return result	107		return result
107		108
108	def nvr_to_urls(self, nvr, arches=None, debuginfo=False, src=True):	109
		110		def nvr_to_urls(self, nvr, arches=['all'], debuginfo=False, src=True):
109	'''Get list of URLs for RPMs corresponding to a build.	111		'''Get list of URLs for RPMs corresponding to a build.
110		112
111	:param str nvr: build NVR	113		:param str nvr: build NVR
112	:param arches: restrict the arches of builds to provide URLs for. By	114		:param arches: restrict the arches of builds to provide URLs for. By
113	default, all architectures are considered. If provided, only those	115		default, all architectures are considered. If you want to consider
114	arches specified in the list are considered.	116		just some selected arches, provide their names in a list.
115		117
116	.. note:: If basearch ``i386`` is in the list, ``i686`` arch is	118		.. note:: If basearch ``i386`` is in the list, ``i686`` arch is
117	automatically added (since that's the arch Koji API uses).	119		automatically added (since that's the arch Koji API uses).
118	:type arches: list of str	120		:type arches: list of str
119	:param bool debuginfo: whether to provide URLs for debuginfo RPM files	121		:param bool debuginfo: whether to provide URLs for debuginfo RPM files
120	as well	122		or ignore them
121	:param bool src: whether to provide URLs for source RPMs as well	123		:param bool src: whether to include a URL for the source RPM
122	:rtype: list of str	124		:rtype: list of str
		125		:raise TaskotronRemoteError: when the requested build doesn't exist
		126		:raise TaskotronValueError: if ``arches=[]`` and ``src=False``,
		127		therefore there is nothing to query for
123	'''	128		'''
124	log.info('Querying Koji for a list of RPMS for: %s', nvr)	129		log.info('Querying Koji for a list of RPMS for: %s', nvr)
125		130
126	# add i686 arch if i386 is present in arches	131		# add i686 arch if i386 is present in arches
127	if arches and 'i386' in arches and 'i686' not in arches:	132		if 'i386' in arches and 'i686' not in arches:
128	arches.append('i686')	133		arches.append('i686')
129		134
		135		# if src is enabled, we need to add it so that it is included in the
		136		# Koji query
		137		if src and ('src' not in arches):
			tflinkUnsubmitted Not Done Can you be consistent on the nested conditionals - either use parens or not?
		138		arches.append('src')
		139
		140		# if "nothing" is requested, it's probably an error
		141		if not arches:
		142		raise exc.TaskotronValueError('Nothing to query for, `arches` was '
		143		'set to an empty list and `src` was disabled. At least one of '
		144		'them need to be non-empty.')
		145
		146		# find the koji build
130	info = self.session.getBuild(nvr)	147		info = self.session.getBuild(nvr)
131	if info is None:	148		if info is None:
132	raise exc.TaskotronRemoteError(	149		raise exc.TaskotronRemoteError(
133	"No build information found for %s" % nvr)	150		"No such build found in Koji: %s" % nvr)
134
135	baseurl = '/'.join((config.get_config().pkg_url, info['package_name'],
136	info['version'], info['release']))
137		151
138	rpms = self.session.listRPMs(buildID=info['id'], arches=arches)	152		# list its RPM files
		153		req_arches = None if 'all' in arches else arches
		154		rpms = self.session.listRPMs(buildID=info['id'], arches=req_arches)
139	if not debuginfo:	155		if not debuginfo:
140	rpms = [r for r in rpms if not r['name'].endswith('-debuginfo')]	156		rpms = [r for r in rpms if not r['name'].endswith('-debuginfo')]
141	if not src:	157		if not src:
142	rpms = [r for r in rpms if not r['arch'] == 'src']	158		rpms = [r for r in rpms if not r['arch'] == 'src']
143		159
		160		# create URLs
		161		baseurl = '/'.join((config.get_config().pkg_url, info['package_name'],
		162		info['version'], info['release']))
144	urls = ['%s/%s' % (baseurl, koji.pathinfo.rpm(r)) for r in rpms]	163		urls = ['%s/%s' % (baseurl, koji.pathinfo.rpm(r)) for r in rpms]
145	if len(urls) == 0:
146	raise exc.TaskotronRemoteError('No RPMs found for %s' % nvr)
147		164
148	return sorted(urls)	165		return sorted(urls)
149		166
150		167
151	def get_nvr_rpms(self, nvr, rpm_dir, arches=None, debuginfo=False,	168		def get_nvr_rpms(self, nvr, dest, arches=['all'], debuginfo=False,
152	src=False):	169		src=False):
153	'''Retrieve the RPMs associated with a build NVR into the specified	170		'''Retrieve the RPMs associated with a build NVR into the specified
154	directory.	171		directory.
155		172
156	:param str nvr build: NVR	173		:param str nvr: build NVR
157	:param str rpm_dir: location where to store the RPMs	174		:param str dest: location where to store the RPMs
158	:param arches: see :meth:`nvr_to_urls`	175		:param arches: see :meth:`nvr_to_urls`
159	:param debuginfo: see :meth:`nvr_to_urls`	176		:param debuginfo: see :meth:`nvr_to_urls`
160	:param src: see :meth:`nvr_to_urls`	177		:param src: see :meth:`nvr_to_urls`
161	:return: list of local filenames of the grabbed RPMs	178		:return: list of local filenames of the grabbed RPMs
162	:rtype: list of str	179		:rtype: list of str
163	:raise TaskotronRemoteError: if issues with target directory	180		:raise TaskotronRemoteError: if the files can't be downloaded or saved
		181		:raise TaskotronValueError: if ``arches=[]`` and ``src=False``,
		182		therefore there is nothing to download
164	'''	183		'''
165		184
166	try:	185		rpm_urls = self.nvr_to_urls(nvr, arches, debuginfo, src)
167	rpm_urls = self.nvr_to_urls(nvr,
168	arches=arches,
169	debuginfo=debuginfo,
170	src=src)
171	except exc.TaskotronRemoteError, e:
172	log.warn('Error while retrieving urls for %s (%s)' % (nvr, arches))
173	log.warn(e)
174	return
175		186
176	rpm_files = []	187		rpm_files = []
177	log.info('Fetching %s RPMs for: %s', len(rpm_urls), nvr)	188		log.info('Fetching %s RPMs for: %s (into %s)', len(rpm_urls), nvr, dest)
178	for url in rpm_urls:	189		for url in rpm_urls:
179	rpm_file = file_utils.download(url, rpm_dir)	190		rpm_file = file_utils.download(url, dest)
180	rpm_files.append(rpm_file)	191		rpm_files.append(rpm_file)
181		192
182	return rpm_files	193		return rpm_files
183		194
184		195
185	def get_tagged_rpms(self, tag, dest, arches):	196		def get_tagged_rpms(self, tag, dest, arches=['all'], debuginfo=False,
		197		src=False):
186	'''Downloads all RPMs of all NVRs tagged by a specific Koji tag.	198		'''Downloads all RPMs of all NVRs tagged by a specific Koji tag.
187		199
		200		Note: This works basically the same as :meth:`get_nvr_rpms`, it just
		201		downloads a lot of builds instead of a single one. For description of
		202		all shared parameters and return values, please see that method.
		203
188	:param str tag: Koji tag to be queried for available builds, e.g.	204		:param str tag: Koji tag to be queried for available builds, e.g.
189	``f20-updates-pending``	205		``f20-updates-pending``
190	:param str dest: destination directory
191	:param arches: see :meth:`nvr_to_urls`
192	:return: list of local filenames of the grabbed RPMs
193	:rtype: list of str
194	:raise TaskotronRemoteError: if issues with target directory
195	'''	206		'''
196	log.debug('Querying Koji for tag: %s' % tag)	207		log.debug('Querying Koji for tag: %s' % tag)
197	tag_data = self.session.listTagged(tag)	208		tag_data = self.session.listTagged(tag)
198		209
199	nvrs = ["%(nvr)s" % x for x in tag_data]	210		nvrs = ["%(nvr)s" % x for x in tag_data]
200	rpms = []	211		rpms = []
201	log.info("Fetching %s builds for tag: %s", len(nvrs), tag)	212		log.info("Fetching %s builds for tag: %s", len(nvrs), tag)
202	log.debug('Builds to be downloaded:\n %s', '\n '.join(nvrs))	213		log.debug('Builds to be downloaded:\n %s', '\n '.join(nvrs))
203		214
204	for nvr in nvrs:	215		for nvr in nvrs:
205	rpms.append(self.get_nvr_rpms(nvr, dest, arches))	216		rpms.append(self.get_nvr_rpms(nvr, dest, arches, debuginfo, src))
206		217
207	return rpms	218		return rpms
208		219
209		220
210	def getNEVR(build):	221		def getNEVR(build):
211	'''Extract RPM version identifier in NEVR format from Koji build object	222		'''Extract RPM version identifier in NEVR format from Koji build object
212		223
213	:param dict build: Koji buildinfo dictionary (as returned e.g. from	224		:param dict build: Koji buildinfo dictionary (as returned e.g. from
Show All 17 Lines

View Options

testing/functest_koji_utils.py

This file was added.

		1		# -- coding: utf-8 --
		2		# Copyright 2014, Red Hat, Inc.
		3		# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+>
		4		# See the LICENSE file for more details on Licensing
		5
		6		'''Functional tests for libtaskotron/koji_utils.py'''
		7
		8		from libtaskotron import koji_utils
		9
		10		from dingus import Dingus
		11
		12
		13		class TestKojiClient():
		14
		15		def setup_method(self, method):
		16		self.ref_nvr = 'foo-1.2-3.fc99'
		17		self.ref_arch = 'noarch'
		18		self.ref_name = 'foo'
		19		self.ref_version = '1.2'
		20		self.ref_release = '3.fc99'
		21		self.ref_buildid = 123456
		22
		23		self.ref_build = {'package_name': self.ref_name,
		24		'version': self.ref_version,
		25		'release': self.ref_release,
		26		'id': self.ref_buildid}
		27
		28		def test_handle_norpms_in_build(self, tmpdir):
		29		""" This tests to make sure that missing rpms in a build are handled
		30		gracefully during download so that execution isn't stopped when a build
		31		is missing an rpm """
		32
		33		rpmdir = tmpdir.mkdir("rpmdownload")
		34		stub_koji = Dingus(getBuild__returns = self.ref_build)
		35		test_koji = koji_utils.KojiClient(stub_koji)
		36
		37		test_koji.get_nvr_rpms(self.ref_nvr, str(rpmdir), arches=[self.ref_arch])

View Options

testing/test_koji_directive.py

Show First 20 Lines • Show All 124 Lines • ▼ Show 20 Line(s)		124	ref_input = {'action': 'download_tag', 'arch': ['x86_64'],
125	'koji_tag': self.ref_tag}	125		'koji_tag': self.ref_tag}
126	ref_envdata = {'workdir': '/var/tmp/foo'}	126		ref_envdata = {'workdir': '/var/tmp/foo'}
127		127
128	stub_koji = Dingus(get_tagged_rpms__returns=self.ref_rpms)	128		stub_koji = Dingus(get_tagged_rpms__returns=self.ref_rpms)
129	test_helper = koji_directive.KojiDirective(stub_koji)	129		test_helper = koji_directive.KojiDirective(stub_koji)
130	test_helper.process(ref_input, ref_envdata)	130		test_helper.process(ref_input, ref_envdata)
131		131
132	getrpm_calls = stub_koji.calls()	132		getrpm_calls = stub_koji.calls()
133	requested_arches = getrpm_calls[0][1][2]	133		requested_arches = getrpm_calls[0][2]['arches']
134		134
135	assert len(getrpm_calls) == 1	135		assert len(getrpm_calls) == 1
136	assert 'x86_64' in requested_arches	136		assert 'x86_64' in requested_arches
137	assert 'noarch' in requested_arches	137		assert 'noarch' in requested_arches
138		138
139	def test__download_command_src(self):	139		def test__download_command_src(self):
140	ref_input = {'action': 'download', 'arch': ['src'],	140		ref_input = {'action': 'download', 'arch': [], 'src': True,
141	'koji_build': self.ref_nvr}	141		'koji_build': self.ref_nvr}
142	ref_envdata = {'workdir': '/var/tmp/foo'}	142		ref_envdata = {'workdir': '/var/tmp/foo'}
143		143
144	stub_koji = Dingus()	144		stub_koji = Dingus()
145	test_helper = koji_directive.KojiDirective(stub_koji)	145		test_helper = koji_directive.KojiDirective(stub_koji)
146	test_helper.process(ref_input, ref_envdata)	146		test_helper.process(ref_input, ref_envdata)
147		147
148	getrpm_calls = stub_koji.calls()	148		getrpm_calls = stub_koji.calls()
149	requested_arches = getrpm_calls[0][2]['arches']	149		requested_arches = getrpm_calls[0][2]['arches']
150	requested_src = getrpm_calls[0][2]['src']	150		requested_src = getrpm_calls[0][2]['src']
151		151
152	assert len(getrpm_calls) == 1	152		assert len(getrpm_calls) == 1
153	assert ['src'] == requested_arches	153		assert [] == requested_arches
154	assert requested_src	154		assert requested_src

View Options

testing/test_koji_utils.py

Show First 20 Lines • Show All 134 Lines • ▼ Show 20 Line(s)		134	except exc.TaskotronRemoteError:
135	pass	135		pass
136		136
137	listrpm_calls = stub_koji.calls('listRPMs')	137		listrpm_calls = stub_koji.calls('listRPMs')
138	requested_arches = listrpm_calls[0][2]['arches']	138		requested_arches = listrpm_calls[0][2]['arches']
139		139
140	assert 'i686' in requested_arches	140		assert 'i686' in requested_arches
141	assert 'i386' in requested_arches	141		assert 'i386' in requested_arches
142		142
143	def should_throw_exception_norpms(self):	143		def should_not_throw_exception_norpms(self):
		144		'''It's possible to have no RPMs (for the given arch) in a build'''
144	stub_koji = Dingus(getBuild__returns = self.ref_build)	145		stub_koji = Dingus(getBuild__returns = self.ref_build)
		146		test_koji = koji_utils.KojiClient(stub_koji)
		147
		148		test_koji.nvr_to_urls(self.ref_nvr, arches = [self.ref_arch])
145		149
		150		def test_nvr_to_urls_src_filtering(self):
		151		stub_koji = Dingus(getBuild__returns=self.ref_build,
		152		listRPMs__returns=self.ref_rpms)
146	test_koji = koji_utils.KojiClient(stub_koji)	153		test_koji = koji_utils.KojiClient(stub_koji)
147		154
148	with pytest.raises(exc.TaskotronRemoteError):	155		# arch and src enabled
149	test_koji.nvr_to_urls(self.ref_nvr, arches = [self.ref_arch])	156		urls = test_koji.nvr_to_urls(self.ref_nvr, arches=[self.ref_arch])
		157		assert len(urls) == 2
		158		assert 'src' in urls[0] or 'src' in urls[1]
150		159
151	def test_handle_norpms_in_build(self, tmpdir):	160		# arch enabled, src disabled
152	""" This tests to make sure that missing rpms in a build are handled	161		urls = test_koji.nvr_to_urls(self.ref_nvr, arches=[self.ref_arch],
153	gracefully during download so that execution isn't stopped when a build	162		src=False)
154	is missing an rpm """	163		assert len(urls) == 1
		164		assert 'src' not in urls[0]
155		165
156	rpmdir = tmpdir.mkdir("rpmdownload")	166		def test_nvr_to_urls_only_src(self):
		167		stub_koji = Dingus(getBuild__returns=self.ref_build)
		168		test_koji = koji_utils.KojiClient(stub_koji)
157		169
158	stub_koji = Dingus(getBuild__returns = self.ref_build)	170		# arch disabled, src enabled
		171		test_koji.nvr_to_urls(self.ref_nvr, arches=[], src=True)
		172		listrpm_calls = stub_koji.calls('listRPMs')
		173		requested_arches = listrpm_calls[0][2]['arches']
		174		assert len(requested_arches) == 1
		175		assert requested_arches[0] == 'src'
159		176
		177		def should_raise_no_arch_no_src(self):
		178		stub_koji = Dingus()
160	test_koji = koji_utils.KojiClient(stub_koji)	179		test_koji = koji_utils.KojiClient(stub_koji)
161		180
162	test_koji.get_nvr_rpms(self.ref_nvr, str(rpmdir), arches = [self.ref_arch])	181		with pytest.raises(exc.TaskotronValueError):
		182		test_koji.nvr_to_urls(self.ref_nvr, arches=[], src=False)
163		183
164		184
165	class TestGetENVR(object):	185		class TestGetENVR(object):
166		186
167	def test_epoch(self):	187		def test_epoch(self):
168	'''Epoch included in build'''	188		'''Epoch included in build'''
169	build = {'nvr': 'foo-1.2-3.fc20',	189		build = {'nvr': 'foo-1.2-3.fc20',
170	'epoch': 1,	190		'epoch': 1,
Show All 14 Lines

lbrabec
garretraziel
tflink
mkrizek
jskladan

		Path
M		libtaskotron/directives/koji_directive.py (91 lines)
M		libtaskotron/koji_utils.py (81 lines)
A	M	testing/functest_koji_utils.py (37 lines)
M		testing/test_koji_directive.py (6 lines)
M		testing/test_koji_utils.py (40 lines)

koji_directive: allow to download all arches and add src option
ClosedPublic
Actions

Details

Diff Detail

Revision Contents

Diff 618

libtaskotron/directives/koji_directive.py

libtaskotron/koji_utils.py

testing/functest_koji_utils.py

testing/test_koji_directive.py

testing/test_koji_utils.py

koji_directive: allow to download all arches and add src optionClosedPublicActions

Details

Diff Detail

Revision Contents

Diff 618

libtaskotron/directives/koji_directive.py

libtaskotron/koji_utils.py

testing/functest_koji_utils.py

testing/test_koji_directive.py

testing/test_koji_utils.py

koji_directive: allow to download all arches and add src option
ClosedPublic
Actions