depcheck/__init__.py
66	this is duplicated in `squash_results` - choose one and import it in the other place
85	why is this logging setup duplicated?
140	this doesn't need to be done in all cases, make sure that logging isn't re-initialized in the case where it is called from libtaskotron
depcheck/depcheck.py
63	same comment as above - why is this duplicated?
153	this dumps the output for every rpm file, making the output crazy long. this only needs to be output once
depcheck/squash_results.py
122	whitespace needs to be removed
123	why is this method in squash_results? It isn't even called from within this file

depcheck/__init__.py
66	That was an oversight on my part; deleting here.
140	This is executed outside of taskotron
depcheck/squash_results.py
123	Yes, but it calls several methods in squash_results and is called from within two other modules. It's as logical a place as any to put it.

depcheck/__init__.py
140	True, but that doesn't mean that it should be run every time, regardless of entry point. Please make it conditional so that it's only executed when the entry point is from the CLI and logging hasn't already been initialized

depcheck/__init__.py
39	these imports aren't being used here
depcheck/depcheck.py
63	I'd rather see this as a module level logger instead of an class logger
depcheck/squash_results.py
131	this needs a `checkname='depcheck'` to get rid of all the `$CHECKNAME` in the TAP output

depcheck/__init__.py
37	Unused import
depcheck/depcheck.py
31	Unused import
40	I really do not quite understand why shoud `report_format` be part of the `Depcheck` class, especially since it never gets used (AFAIK). Is there any reason, that I missed, to have it there?
depcheck/metadata.py
33	unused import
depcheck/squash_results.py
3	unused import

depcheck/depcheck.py
34	Noticed one more unused import. Please check all the source codes for unnecessary imports.
depcheck/metadata.py
71	The newlines were probably useful in printouts, but I'm not sure it it necessary for the logging purposes. Any thoughts @tflink?

depcheck/__init__.py
37	tempfile and platform are still used in the code (creating a tempdir in cli mode and arch autodetect, respectively). either the code needs to be removed or the imports need to be restored
depcheck/metadata.py
71	I think this should be at least a warning
depcheck/squash_results.py
65–66	this is not debug, it's an error and the comment should go away
94	this shouldn't be a debug message - warning at the very least

depcheck/__init__.py
122	indentation doesn't match

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	663			Sep 29 2014, 8:18 PM	★	★
Diff 2	670			Oct 6 2014, 5:11 PM	★	★
Diff 3	677			Oct 7 2014, 11:44 PM	★	★
Diff 4	678			Oct 8 2014, 12:36 AM	★	★
Diff 5	679			Oct 8 2014, 1:08 AM	★	★
Diff 6	680			Oct 8 2014, 2:15 AM	★	★
Diff 7	681			Oct 8 2014, 8:09 AM	★	★
Diff 8	682	1557d0f	- minor logging fixes	Oct 8 2014, 1:28 PM	★	★
Diff 9	683	1557d0f	- Fixed according to review	Oct 8 2014, 2:18 PM	★	★
Diff 10	684	1557d0f	- Fixed the 'no results' handling	Oct 8 2014, 2:32 PM	★	★
Diff 11	685	1557d0f	- Nitpicky nitpick - fixed indentation for a commented line	Oct 8 2014, 2:44 PM	★	★
Diff 12	686	1557d0f	Commit rDEPCK3ba8ad74c8d526be90aaf0cebe5baa52c172dde6	Oct 8 2014, 2:48 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
788ec082d563	eb627a47bb26	7935a4036245	Josef Skladanka	Nitpicky nitpick - fixed indentation for a commented line	Oct 8 2014, 2:43 PM
7935a4036245	42d4230f230a	d4923449792f	Josef Skladanka	Fixed the 'no results' handling	Oct 8 2014, 2:32 PM
d4923449792f	51b3dffe3838	99deee31bfc9	Josef Skladanka	Fixed according to review	Oct 8 2014, 2:18 PM
99deee31bfc9	1aadd5fb56e5	5e239614565a	Josef Skladanka	minor logging fixes	Oct 8 2014, 1:28 PM
5e239614565a	b706b48f401c	1557d0f83adb	Josef Skladanka	T336: Enable logging in depcheck (Show More…)	Oct 8 2014, 8:44 AM

Diff 686

depcheck/init.py

Show All 28 Lines
29		29
30	# It is crucial that these are the same as libtaskotron/check possible outcomes	30		# It is crucial that these are the same as libtaskotron/check possible outcomes
31	Pass = 'PASSED'	31		Pass = 'PASSED'
32	Fail = 'FAILED'	32		Fail = 'FAILED'
33		33
34	import os.path	34		import os.path
35	import sys	35		import sys
36	import argparse	36		import argparse
37	import tempfile	37		import tempfile
	tflinkUnsubmitted Not Done tempfile and platform are still used in the code (creating a tempdir in cli mode and arch autodetect, respectively). either the code needs to be removed or the imports need to be restored
			jskladanAuthorUnsubmitted Not Done Unused import
38	import platform	38		import platform
39	import json
40		39
			tflinkUnsubmitted Not Done these imports aren't being used here
41	from . import depcheck	40		from . import depcheck
42	from . import metadata	41		from . import metadata
43	from . import exc	42		from . import exc
44	from . import squash_results	43		from . import squash_results
		44		from . import log
45		45
46	from libtaskotron.python_utils import iterable	46		from libtaskotron.python_utils import iterable
47		47
48		48
49	def dir_to_rpms(dirname):	49		def dir_to_rpms(dirname):
50	"""Find all rpms in the specified directory	50		"""Find all rpms in the specified directory
51	:param dirname: local directory in which to look for rpms	51		:param dirname: local directory in which to look for rpms
52	:type dirnema: str	52		:type dirnema: str
53	:returns: list of rpm files with absolute, local path	53		:returns: list of rpm files with absolute, local path
54	"""	54		"""
55	rpm_list = []	55		rpm_list = []
56	for filename in os.listdir(dirname):	56		for filename in os.listdir(dirname):
57	if filename.endswith('.rpm'):	57		if filename.endswith('.rpm'):
58	rpm_list.append(os.path.join(dirname, filename))	58		rpm_list.append(os.path.join(dirname, filename))
59	return rpm_list	59		return rpm_list
60		60
61		61
62	def extract_named_repo(namedrepo):	62		def extract_named_repo(namedrepo):
63	return namedrepo.split(':', 1)	63		return namedrepo.split(':', 1)
64		64
65		65		def run(rpms, arch, repos, report_format="updates", workdir=None):
66	def run(rpms, arch, repos, report_format="rpms", workdir=None):
67	"""	66		"""
			tflinkUnsubmitted Not Done this is duplicated in `squash_results` - choose one and import it in the other place
			jdulaneyUnsubmitted Not Done That was an oversight on my part; deleting here.
68	report_format: rpms, updates	67		report_format: rpms, updates
69	"""	68		"""
70
71	# handle directory args, expanding them to a list of rpm files with absolute	69		# handle directory args, expanding them to a list of rpm files with absolute
72	# paths	70		# paths
73	if isinstance(rpms, basestring):	71		if isinstance(rpms, basestring):
74	rpms = [rpms]	72		rpms = [rpms]
75	if not iterable(rpms, basestring):	73		if not iterable(rpms, basestring):
76	raise exc.DepcheckException("rpms argument must be either string"	74		raise exc.DepcheckException("rpms argument must be either string"
77	"or list of strings")	75		"or list of strings")
78		76
79	rpmlist = []	77		rpmlist = []
80	for filename in rpms:	78		for filename in rpms:
81	if os.path.isdir(filename):	79		if os.path.isdir(filename):
82	rpmlist.extend(dir_to_rpms(filename))	80		rpmlist.extend(dir_to_rpms(filename))
83	else:	81		else:
84	rpmlist.append(filename)	82		rpmlist.append(filename)
85		83
86	# arm has some special case requirements for arch handling	84		# arm has some special case requirements for arch handling
87	# Fixup for arm; the yum repo is labled as armhfp but the nvr is armv7hl	85		# Fixup for arm; the yum repo is labled as armhfp but the nvr is armv7hl
			tflinkUnsubmitted Not Done why is this logging setup duplicated?
88	if arch == 'armv7l':	86		if arch == 'armv7l':
89	arch = 'armhfp'	87		arch = 'armhfp'
90		88
91	# fix arch for libsolv	89		# fix arch for libsolv
92	if arch == 'i386':	90		if arch == 'i386':
93	arch = 'i686'	91		arch = 'i686'
94		92
95	# handle data formatting for repo metadata (list of dicts)	93		# handle data formatting for repo metadata (list of dicts)
		94		log.logger.debug("Prepairing metadata download")
96	handled_repos = {}	95		handled_repos = {}
97	for repo, path in repos.items():	96		for repo, path in repos.items():
		97		log.logger.debug(" - %r: %r, %r", repo, arch, path)
98	handled_repos[repo] = {'arch': arch, 'path': path}	98		handled_repos[repo] = {'arch': arch, 'path': path}
99		99
100	if workdir is None:	100		if workdir is None:
101	workdir = tempfile.mkdtemp('', 'depcheck-', '/var/tmp/')	101		workdir = tempfile.mkdtemp('', 'depcheck-', '/var/tmp/')
102	else:	102		else:
103	# FIXME - fix properly, sometimes. The reason for adding arch	103		# FIXME - fix properly, sometimes. The reason for adding arch
104	# is that in depcheck.yml there are two runs of the depcheck	104		# is that in depcheck.yml there are two runs of the depcheck
105	# right after each other.	105		# right after each other.
106	workdir = os.path.join(workdir, 'depcheck_workdir_%s' % arch)	106		workdir = os.path.join(workdir, 'depcheck_workdir_%s' % arch)
107	os.makedirs(workdir)	107		os.makedirs(workdir)
108		108
		109		log.logger.info("Getting metadata...")
		110		# FIXME this call takes a long time, log progress gradualy so buildbot won't
		111		# kill the process
109	md_handle = metadata.DepcheckMetadata(handled_repos, targetdir=workdir)	112		md_handle = metadata.DepcheckMetadata(handled_repos, targetdir=workdir)
110		113
111	repomd_files = md_handle.repodata	114		repomd_files = md_handle.repodata
112		115
113	output = None	116		log.logger.info("Running Depcheck")
114
115	depck = depcheck.Depcheck(str(arch), repomd_files, workdir=workdir)	117		depck = depcheck.Depcheck(str(arch), repomd_files, workdir=workdir)
116	run_result = depck.check_rpm_deps(rpmlist)	118		run_result = depck.check_rpm_deps(rpmlist)
117		119
118	if report_format == 'updates':	120		log.logger.info("Formatting output")
119	# remove the arch conversion to be consistent with cmdline arch	121
120	if arch == 'i686':	122		# Sometimes, depcheck gets run with no rpms
			tflinkUnsubmitted Not Done indentation doesn't match
121	arch = 'i386'	123		if not run_result:
122	results = squash_results.squash_results(run_result)	124		log.logger.info("No results")
123	for result in results:	125
124	result.keyvals['arch'] = arch	126		output = squash_results.format_output(run_result, arch, report_format)
125	output = squash_results.check.export_TAP(results)	127		log.logger.info(output)
126	else:
127	output = json.dumps(run_result, indent=4, separators=(',', ': '))
128	# Also print output to stdout as a quick fix for T336
129	print output
130		128
131	return output	129		return output
132		130
133	def depcheck_cli():	131		def depcheck_cli():
134	parser = argparse.ArgumentParser()	132		parser = argparse.ArgumentParser()
135	parser.add_argument("rpm", nargs='+', help="RPM to be tested")	133		parser.add_argument("rpm", nargs='+', help="RPM to be tested")
136	parser.add_argument("-a", "--arch", choices=["i386", "x86_64", "armhfp"], help="""	134		parser.add_argument("-a", "--arch", choices=["i386", "x86_64", "armhfp"], help="""
137	Architecture to be tested; support arches are x86, x86_64, and armhfp.	135		Architecture to be tested; support arches are x86, x86_64, and armhfp.
138	If omitted, defaults to current machine architecture.	136		If omitted, defaults to current machine architecture.
139	""")	137		""")
140	parser.add_argument("-r", "--repos", nargs='+', action='store', help="""	138		parser.add_argument("-r", "--repos", nargs='+', action='store', help="""
141	Repo to be tested against, in the form of reponame:repolocation where	139		Repo to be tested against, in the form of reponame:repolocation where
142	repolocation can be local (in the form /dir/of/repo) or	140		repolocation can be local (in the form /dir/of/repo) or
			tflinkUnsubmitted Not Done this doesn't need to be done in all cases, make sure that logging isn't re-initialized in the case where it is called from libtaskotron
			jdulaneyUnsubmitted Not Done This is executed outside of taskotron
			tflinkUnsubmitted Not Done True, but that doesn't mean that it should be run every time, regardless of entry point. Please make it conditional so that it's only executed when the entry point is from the CLI and logging hasn't already been initialized
143	remote (direct link or standard metalink), to be tested against.	141		remote (direct link or standard metalink), to be tested against.
144	""")	142		""")
145	parser.add_argument("-f", "--format", choices=["rpms", "updates"], help="""	143		parser.add_argument("-f", "--format", choices=["rpms", "updates"], help="""
146	Specify output format to override configuration	144		Specify output format to override configuration
147	""")	145		""")
148		146
149		147
150	args = parser.parse_args()	148		args = parser.parse_args()
Show All 13 Lines

View Options

depcheck/depcheck.py

Show All 22 Lines
23	# John H. Dulaney <jdulaney@fedoraproject.org>	23		# John H. Dulaney <jdulaney@fedoraproject.org>
24	# Tim Flink <tflink@redhat.com>	24		# Tim Flink <tflink@redhat.com>
25	#	25		#
26	# EPEL dep: python-argparse	26		# EPEL dep: python-argparse
27		27
28		28
29	import solv	29		import solv
30	import tempfile	30		import tempfile
31		31
			jskladanAuthorUnsubmitted Not Done Unused import
32	from . import Pass, Fail	32		from . import Pass, Fail
33	from . import exc	33		from . import exc
		34		from . import log
			jskladanAuthorUnsubmitted Not Done Noticed one more unused import. Please check all the source codes for unnecessary imports.
34		35
35		36
36	class Depcheck(object):	37		class Depcheck(object):
37	def __init__(self, arch, repodata, workdir=None):	38		def __init__(self, arch, repodata, workdir=None):
38	"""Depcheck uses existing repodata to check a set of rpm files for	39		"""Depcheck uses existing repodata to check a set of rpm files for
39	depsolving issues.	40		depsolving issues.
			jskladanAuthorUnsubmitted Not Done I really do not quite understand why shoud `report_format` be part of the `Depcheck` class, especially since it never gets used (AFAIK). Is there any reason, that I missed, to have it there?
40		41
41	This class itself doesn't handle much other than checking rpms and all	42		This class itself doesn't handle much other than checking rpms and all
42	data prep needs to be handled externally	43		data prep needs to be handled externally
43		44
44	:param arch: The repository arch to use for dependency solving	45		:param arch: The repository arch to use for dependency solving
45	:type arch: str (not unicode)	46		:type arch: str (not unicode)
46	:param repodata: local paths to downloaded and verified repodata	47		:param repodata: local paths to downloaded and verified repodata
47	:type repodata: dir of dir {'reponame': {'primary': primarygz_filename, 'filelists': filelists_filename}...}	48		:type repodata: dir of dir {'reponame': {'primary': primarygz_filename, 'filelists': filelists_filename}...}
48	:param workdir: The directory to use for depcheck work, a temp directory will be created if workdir is None	49		:param workdir: The directory to use for depcheck work, a temp directory will be created if workdir is None
49	:type workdir: str	50		:type workdir: str
50	"""	51		"""
51		52
52	self.arch = arch	53		self.arch = arch
53	self.repos = repodata	54		self.repos = repodata
54	self.solvpool_object = None	55		self.solvpool_object = None
55	self.solvrepo_object = None	56		self.solvrepo_object = None
56	if workdir is None:	57		if workdir is None:
57	self.workdir = tempfile.mkdtemp('', 'depcheck-', '/var/tmp/')	58		self.workdir = tempfile.mkdtemp('', 'depcheck-', '/var/tmp/')
58	else:	59		else:
59	self.workdir = workdir	60		self.workdir = workdir
60		61
61	@property	62		@property
62	def solvpool(self):	63		def solvpool(self):
			tflinkUnsubmitted Not Done same comment as above - why is this duplicated?
			tflinkUnsubmitted Not Done I'd rather see this as a module level logger instead of an class logger
63	if self.solvpool_object is None:	64		if self.solvpool_object is None:
64	self.solvpool_object = solv.Pool()	65		self.solvpool_object = solv.Pool()
65	self.solvpool_object.setarch(self.arch)	66		self.solvpool_object.setarch(self.arch)
66	return self.solvpool_object	67		return self.solvpool_object
67		68
68	@property	69		@property
69	def solvrepo(self):	70		def solvrepo(self):
70	if self.solvrepo_object is None:	71		if self.solvrepo_object is None:
▲ Show 20 Lines • Show All 53 Lines • ▼ Show 20 Line(s)		120	def check_rpm_deps(self, rpmfiles):
124	:returns: dictionary of results {rpm: {'results': Pass/Fail, 'details': []}}	125		:returns: dictionary of results {rpm: {'results': Pass/Fail, 'details': []}}
125	"""	126		"""
126		127
127	self._prepare_libsolv()	128		self._prepare_libsolv()
128		129
129	run_result = {}	130		run_result = {}
130		131
131	for rpmfile in rpmfiles:	132		for rpmfile in rpmfiles:
132	print 'running depcheck for %s' % rpmfile	133		log.logger.debug('running depcheck for %s' % rpmfile)
133	result_state, result_details = self._check_rpm(rpmfile)	134		result_state, result_details = self._check_rpm(rpmfile)
134		135
135	if rpmfile in run_result:	136		if rpmfile in run_result:
136	if result_state != run_result[rpmfile]['result']:	137		if result_state != run_result[rpmfile]['result']:
137	#TODO maybe do something saner, ideas welcomed	138		#TODO maybe do something saner, ideas welcomed
138	raise exc.DepcheckException("RPM %r has multiple conflicting results" % rpmfile)	139		raise exc.DepcheckException("RPM %r has multiple conflicting results" % rpmfile)
139	else:	140		else:
140	run_result[rpmfile]['details'].append(result_details)	141		run_result[rpmfile]['details'].append(result_details)
141		142
142	else:	143		else:
143	run_result[rpmfile] = {'result': result_state,	144		run_result[rpmfile] = {'result': result_state,
144	'details': result_details}	145		'details': result_details}
145		146
146	return run_result	147		return run_result
147		148
148		149
149		150
			tflinkUnsubmitted Not Done this dumps the output for every rpm file, making the output crazy long. this only needs to be output once

View Options

depcheck/log.py

This file was added.

		1		# depcheck.py - core logic and interfaces for checking dependency trees
		2		#
		3		# Licensed under the GNU General Public License Version 2
		4		#
		5		# This program is free software; you can redistribute it and/or
		6		# modify it under the terms of the GNU General Public License
		7		# as published by the Free Software Foundation; either version 2
		8		# of the License, or (at your option) any later version.
		9		#
		10		# This program is distributed in the hope that it will be useful,
		11		# but WITHOUT ANY WARRANTY; without even the implied warranty of
		12		# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		13		# GNU General Public License for more details.
		14		#
		15		# You should have received a copy of the GNU General Public License
		16		# along with this program; if not, write to the Free Software
		17		# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
		18		#
		19		# Copyright 2013, 2014 John H. Dulaney
		20		# Copyright 2014 Red Hat, Inc
		21		#
		22		# Authors:
		23		# John H. Dulaney <jdulaney@fedoraproject.org>
		24		# Tim Flink <tflink@redhat.com>
		25
		26		import logging
		27
		28		# Someone call for a lumberjack?
		29		logger = logging.getLogger('depcheck')
		30		logger.setLevel(logging.INFO)
		31		logger.addHandler(logging.NullHandler())

View Options

depcheck/metadata.py

Show All 24 Lines
25		25
26	import librepo	26		import librepo
27	import tempfile	27		import tempfile
28	import os	28		import os
29	import glob	29		import glob
30	import gzip	30		import gzip
31	import shutil	31		import shutil
32	import sys	32		import sys
33		33
			jskladanAuthorUnsubmitted Not Done unused import
		34		from . import log
34		35
35	class DepcheckMetadata(object):	36		class DepcheckMetadata(object):
36	def __init__(self, repos, targetdir=None, uncompress=True):	37		def __init__(self, repos, targetdir=None, uncompress=True):
37	""" Handle yum repo metadata and prepare it for use by Depcheck.	38		""" Handle yum repo metadata and prepare it for use by Depcheck.
38		39
39	Repository information is passed in as a dict of dicts:	40		Repository information is passed in as a dict of dicts:
40	{'reponame': {'path': path_to_repo, 'arch': arch}}	41		{'reponame': {'path': path_to_repo, 'arch': arch}}
41		42
Show All 20 Lines
62		63
63	if targetdir is None:	64		if targetdir is None:
64	self.targetdir = tempfile.mkdtemp('', 'depcheck-', '/var/tmp/')	65		self.targetdir = tempfile.mkdtemp('', 'depcheck-', '/var/tmp/')
65	else:	66		else:
66	self.targetdir = targetdir	67		self.targetdir = targetdir
67		68
68		69
69	def hmfcb(_, msg, url, metadata, __):	70		def hmfcb(_, msg, url, metadata, __):
70	print "\n \n \n Mirror Error: %s %s" % (msg, url)	71		log.logger.warning("Mirror Error: %s %s" % (msg, url))
			jskladanAuthorUnsubmitted Not Done The newlines were probably useful in printouts, but I'm not sure it it necessary for the logging purposes. Any thoughts @tflink?
			tflinkUnsubmitted Not Done I think this should be at least a warning
71		72
72		73
73	def _download_repo_metadata(self, url, targetdir,	74		def _download_repo_metadata(self, url, targetdir,
74	mdtypes=['filelists', 'primary']):	75		mdtypes=['filelists', 'primary']):
75	""" Download repomd files from the specified remote repository. Repository	76		""" Download repomd files from the specified remote repository. Repository
76	metalinks and direct links are both supported with no need for input from	77		metalinks and direct links are both supported with no need for input from
77	the user.	78		the user.
78		79
▲ Show 20 Lines • Show All 87 Lines • ▼ Show 20 Line(s)		163	for mdtype in repofiles:
166	try:	167		try:
167	f_in = gzip.open(repofiles[mdtype], 'rb')	168		f_in = gzip.open(repofiles[mdtype], 'rb')
168	f_out = open(new_filepath, 'wb')	169		f_out = open(new_filepath, 'wb')
169	f_out.writelines(f_in)	170		f_out.writelines(f_in)
170	f_out.close()	171		f_out.close()
171	f_in.close()	172		f_in.close()
172	except IOError as e:	173		except IOError as e:
173	# this needs to be handled better, is temporary	174		# this needs to be handled better, is temporary
174	print e	175		log.logger.debug(e)
175	raise Exception("Error uncompressing mdfile %s to %s" % (repofiles[mdtype], new_filepath))	176		raise Exception("Error uncompressing mdfile %s to %s" % (repofiles[mdtype], new_filepath))
176		177
177	new_repofiles[mdtype] = new_filepath	178		new_repofiles[mdtype] = new_filepath
178	return new_repofiles	179		return new_repofiles
179		180
180	def _handle_local_repofiles(self, repopath, target_repodir):	181		def _handle_local_repofiles(self, repopath, target_repodir):
181	""" Find repomd files in a local repository and copy them to the target	182		""" Find repomd files in a local repository and copy them to the target
182	directory.	183		directory.
▲ Show 20 Lines • Show All 72 Lines • Show Last 20 Lines

View Options

depcheck/squash_results.py

1	import os	1		import os
		2		import json
2		3
			jskladanAuthorUnsubmitted Not Done unused import
3	from . import Pass, Fail	4		from . import Pass, Fail
		5		from . import log
4		6
5	from libtaskotron.koji_utils import KojiClient	7		from libtaskotron.koji_utils import KojiClient
6	from libtaskotron.bodhi_utils import BodhiUtils	8		from libtaskotron.bodhi_utils import BodhiUtils
7	from libtaskotron import check	9		from libtaskotron import check
8	from libtaskotron.rpm_utils import rpmformat	10		from libtaskotron.rpm_utils import rpmformat
9		11
10	def _squash_rpms_to_builds(run_result, koji_client = None):	12		def _squash_rpms_to_builds(run_result, koji_client = None):
11	"""	13		"""
▲ Show 20 Lines • Show All 43 Lines • ▼ Show 20 Line(s)		47	def _squash_builds_to_updates(results_nvr, bodhi_client = None):
55		57
56	pending_ok, pending_fail = bodhi_client.build2update(results_nvr.keys(), strict = True)	58		pending_ok, pending_fail = bodhi_client.build2update(results_nvr.keys(), strict = True)
57		59
58	updates = {}	60		updates = {}
59	for _, update in pending_ok.items():	61		for _, update in pending_ok.items():
60	updates[update['title']] = update	62		updates[update['title']] = update
61		63
62	for build, update in pending_fail.items():	64		for build, update in pending_fail.items():
63	if update is None:	65		if update is None:
64	#FIXME change print to log	66		log.logger.error("Build without an update: %r" % build)
			tflinkUnsubmitted Not Done this is not debug, it's an error and the comment should go away
65	print "ERR: build without an update: %r" % build
66	continue	67		continue
67	if update['title'] not in updates:	68		if update['title'] not in updates:
68	updates[update['title']] = update	69		updates[update['title']] = update
69		70
70	updates_results = []	71		updates_results = []
71	for update_title, update in updates.items():	72		for update_title, update in updates.items():
72	cd = check.CheckDetail(update_title, check.ReportType.BODHI_UPDATE, outcome = 'PASSED')	73		cd = check.CheckDetail(update_title, check.ReportType.BODHI_UPDATE, outcome = 'PASSED')
73	updates_results.append(cd)	74		updates_results.append(cd)
Show All 11 Lines		77	for build in update['builds']:
85	if build in pending_fail.keys():	86		if build in pending_fail.keys():
86	cd.update_outcome('ABORTED')	87		cd.update_outcome('ABORTED')
87	cd.store('Update was incomplete.')	88		cd.store('Update was incomplete.')
88	break	89		break
89		90
90	if build not in pending_ok.keys():	91		if build not in pending_ok.keys():
91	cd.update_outcome('ABORTED')	92		cd.update_outcome('ABORTED')
92	untested_builds.append(build)	93		untested_builds.append(build)
93	print "Untested build %s for update %s" % (build, update_title)	94		log.logger.warning("Untested build %s for update %s" % (build, update_title))
			tflinkUnsubmitted Not Done this shouldn't be a debug message - warning at the very least
94	continue	95		continue
95		96
96	if results_nvr[build]['result'] != Pass:	97		if results_nvr[build]['result'] != Pass:
97	cd.update_outcome('FAILED')	98		cd.update_outcome('FAILED')
98	cd.store('Build %s failed depcheck' % build)	99		cd.store('Build %s failed depcheck' % build)
99	cd.output.extend(results_nvr[build]['details'])	100		cd.output.extend(results_nvr[build]['details'])
100		101
101	if untested_builds:	102		if untested_builds:
Show All 11 Lines
113	return updates_results	114		return updates_results
114		115
115		116
116	def squash_results(run_result, bodhi_client = None, koji_client = None):	117		def squash_results(run_result, bodhi_client = None, koji_client = None):
117	per_nvr = _squash_rpms_to_builds(run_result, koji_client)	118		per_nvr = _squash_rpms_to_builds(run_result, koji_client)
118	per_update = _squash_builds_to_updates(per_nvr, bodhi_client)	119		per_update = _squash_builds_to_updates(per_nvr, bodhi_client)
119		120
120	return per_update	121		return per_update
		122
			tflinkUnsubmitted Not Done whitespace needs to be removed
		123		def format_output(run_result, arch, report_format="rpms"):
			tflinkUnsubmitted Not Done why is this method in squash_results? It isn't even called from within this file
			jdulaneyUnsubmitted Not Done Yes, but it calls several methods in squash_results and is called from within two other modules. It's as logical a place as any to put it.
		124		if report_format == 'updates':
		125		if run_result:
		126		# remove the arch conversion to be consistent with cmdline arch
		127		if arch == 'i686':
		128		arch = 'i386'
		129		results = squash_results(run_result)
		130		for result in results:
		131		result.keyvals['arch'] = arch
			tflinkUnsubmitted Not Done this needs a `checkname='depcheck'` to get rid of all the `$CHECKNAME` in the TAP output
		132		output = check.export_TAP(results, checkname='depcheck')
		133		else:
		134		output = check.export_TAP([])
		135		else:
		136		output = json.dumps(run_result, indent=4, separators=(',', ': '))
		137
		138		return output

View Options

run_depcheck.py

1	#!/usr/bin/python	1	#!/usr/bin/python
2		2
3	import sys	3	import sys
4	import os	4	import os
5		5
6	sys.path.insert(0, os.path.realpath(os.path.dirname(__file__)))	6	sys.path.insert(0, os.path.realpath(os.path.dirname(__file__)))
7		7
8	import depcheck	8	import depcheck
9	from depcheck import exc	9	from depcheck import exc
		10	from depcheck import log
10		11
11	def taskotron_run(rpms, arch, repos, report_format, workdir=None):	12	def taskotron_run(rpms, arch, repos, report_format, workdir=None):
12	"""	13	"""
13	rpms: list of rpm files and/or directories containing rpm files	14	rpms: list of rpm files and/or directories containing rpm files
14	arch: list of arches that can contain just one 'primary' arch	15	arch: list of arches that can contain just one 'primary' arch
15	repos: dictionary or list of dictionaries	16	repos: dictionary or list of dictionaries
16	report_format: "rpms" or "updates"	17	report_format: "rpms" or "updates"
17	"""	18	"""
18		19
		20	# As this is only called from libtaskotron, set the logging
		21	# to the same level as libtaskotron.
		22	libtaskotron_logger = log.logging.getLogger('libtaskotron')
		23	log.logger.setLevel(libtaskotron_logger.getEffectiveLevel())
		24
19	# FIXME: do something saner in the future - nasty fix for the moment	25	# FIXME: do something saner in the future - nasty fix for the moment
20	filtered_arches = [a for a in arch if a not in ['noarch', 'all', 'src']]	26	filtered_arches = [a for a in arch if a not in ['noarch', 'all', 'src']]
21		27
22	if len(filtered_arches) > 1:	28	if len(filtered_arches) > 1:
23	raise exc.DepcheckException("Too many 'primary' arches provided:"	29	raise exc.DepcheckException("Too many 'primary' arches provided:"
24	" %r" % filtered_arches)	30	" %r" % filtered_arches)
25	if len(filtered_arches) == 0:	31	if len(filtered_arches) == 0:
26	raise exc.DepcheckException("No 'primary' arch provided")	32	raise exc.DepcheckException("No 'primary' arch provided")
Show All 22 Lines

		Path
M		depcheck/__init__.py (34 lines)
M		depcheck/depcheck.py (3 lines)
A	M	depcheck/log.py (31 lines)
M		depcheck/metadata.py (5 lines)
M		depcheck/squash_results.py (24 lines)
M		run_depcheck.py (6 lines)

T336: Enable logging in depcheck
ClosedPublic
Actions

Details

Diff Detail

Revision Contents

Diff 686

depcheck/init.py

depcheck/depcheck.py

depcheck/log.py

depcheck/metadata.py

depcheck/squash_results.py

run_depcheck.py

T336: Enable logging in depcheckClosedPublicActions

Details

Diff Detail

Revision Contents

Diff 686

depcheck/__init__.py

depcheck/depcheck.py

depcheck/log.py

depcheck/metadata.py

depcheck/squash_results.py

run_depcheck.py

T336: Enable logging in depcheck
ClosedPublic
Actions

depcheck/init.py