Differential D517

un-doing change to update alias as primary key. Fixes T578
ClosedPublic
Actions

Authored by tflink on Aug 20 2015, 5:58 AM.

Details

Reviewers

kparal

Maniphest Tasks

T578: don't assume that update['alias'] exists in updates

Commits

rDEPCK45691b7cb8b8: un-doing change to update alias as primary key. Fixes T578

Summary

handles both bodhi1 and bodhi2 style updates and keeps depcheck from exploding when 'alias' is missing

Test Plan

ran locally, tests pass fine

Diff Detail

Repository

rDEPCK task-depcheck

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

tflink retitled this revision from to un-doing change to update alias as primary key. Fixes T578.Aug 20 2015, 5:58 AM

tflink updated this object.

tflink edited the test plan for this revision. (Show Details)

tflink added a reviewer: kparal.

Herald added a subscriber: tflink. · View Herald TranscriptAug 20 2015, 5:58 AM

fixing logic issue and improving solution

kparal added a task: T578: don't assume that update['alias'] exists in updates.Aug 20 2015, 6:20 AM

adding missing docstring to test

Looks good.

tests/test_squash_results.py
203–204	Might be filled in or removed. I prefer filled it, e.g. with a link to https://phab.qadevel.cloud.fedoraproject.org/T578 :-)

This revision is now accepted and ready to land.Aug 20 2015, 6:24 AM

Closed by commit rDEPCK45691b7cb8b8: un-doing change to update alias as primary key. Fixes T578 (authored by tflink). · Explain WhyAug 20 2015, 6:28 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents

			Path	Packages
M			depcheck/squash_results.py (24 lines)
M			tests/test_squash_results.py (26 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	1352	b9ef183		Aug 20 2015, 5:58 AM	★	★
Diff 2	1353	b9ef183	- fixing logic issue and improving solution	Aug 20 2015, 6:05 AM	★	★
Diff 3	1355	b9ef183	- adding missing docstring to test	Aug 20 2015, 6:22 AM	★	★
Diff 4	1357	b9ef183	Commit rDEPCK45691b7cb8b84d1b912baa7cd4b345c62242bc6b	Aug 20 2015, 6:25 AM	★	★

Commit	Tree	Parents	Author	Summary	Date
ed354e1cf4ce	db5048d0df6c	7a85144b1ae5	Tim Flink	adding missing docstring to test	Aug 20 2015, 6:21 AM
7a85144b1ae5	b8df1b607aeb	1b4504a20b57	Tim Flink	fixing logic issue and improving solution	Aug 20 2015, 6:05 AM
1b4504a20b57	eaaee4ff22ef	b9ef183596b3	Tim Flink	un-doing change to update alias as primary key. Fixes T578 (Show More…)	Aug 20 2015, 5:55 AM

Diff 1357

View Options

depcheck/squash_results.py

Show First 20 Lines • Show All 52 Lines • ▼ Show 20 Line(s)		46	def _squash_builds_to_updates(results_nvr, bodhi_client = None):
53	"""	53		"""
54	if bodhi_client is None:	54		if bodhi_client is None:
55	bodhi_client = BodhiUtils()	55		bodhi_client = BodhiUtils()
56		56
57	pending_ok, pending_fail = bodhi_client.build2update(results_nvr.keys(), strict = True)	57		pending_ok, pending_fail = bodhi_client.build2update(results_nvr.keys(), strict = True)
58		58
59	updates = {}	59		updates = {}
60	for _, update in pending_ok.items():	60		for _, update in pending_ok.items():
61	updates[update['alias']] = update	61		update_name = update.get('alias') or update['title']
		62		updates[update_name] = update
		63
62		64
63	for build, update in pending_fail.items():	65		for build, update in pending_fail.items():
64	if update is None:	66		if update is None:
65	log.logger.error("Build without an update: %r" % build)	67		log.logger.error("Build without an update: %r" % build)
66	continue	68		continue
67	if update['alias'] not in updates:	69		update_name = update.get('alias') or update['title']
68	updates[update['alias']] = update	70		if update_name not in updates:
		71		updates[update_name]= update
		72
69		73
70	updates_results = []	74		updates_results = []
71	for update_alias, update in updates.items():	75		for update_alias, update in updates.items():
72	cd = check.CheckDetail(update_alias, check.ReportType.BODHI_UPDATE, outcome = 'PASSED')	76		cd = check.CheckDetail(update_alias, check.ReportType.BODHI_UPDATE, outcome = 'PASSED',
		77		checkname='depcheck')
73	updates_results.append(cd)	78		updates_results.append(cd)
74		79
75	builds = sorted([build['nvr'] for build in update['builds']])	80		builds = sorted([build['nvr'] for build in update['builds']])
76		81
77	if set(builds).intersection(set(pending_fail.keys())):	82		if set(builds).intersection(set(pending_fail.keys())):
78	# A build is in pending_fail either when it has no assigned	83		# A build is in pending_fail either when it has no assigned
79	# update (that can not happen, as we traverse builds of	84		# update (that can not happen, as we traverse builds of
80	# a specific update), or when an update was incomplete	85		# a specific update), or when an update was incomplete
▲ Show 20 Lines • Show All 85 Lines • ▼ Show 20 Line(s)		168	try:
166		171
167	if not os.path.exists(storedir):	172		if not os.path.exists(storedir):
168	os.makedirs(storedir)	173		os.makedirs(storedir)
169		174
170	# save logs	175		# save logs
171	for result in results:	176		for result in results:
172	item = result.item	177		item = result.item
173	filename = "%s.%s.log" % (item, result.keyvals['arch'])	178		filename = "%s.%s.log" % (item, result.keyvals['arch'])
		179
		180		# Bodhi update titles can be very long, we need to trim them
		181		if len(filename) > 255: # the max file name length for most Linux filesystems
		182		exceed_len = len(filename) - 255
		183		# length of ellipsis, .log and arch to make total length 255 char
		184		extra_bits = 3 + 4 + len(result.keyvals['arch'])
		185		item = item[:-exceed_len-extra_bits] + '...'
		186		# don't need . separating item and arch since item ends with ... now
		187		filename = "%s%s.log" % (item, result.keyvals['arch'])
		188		assert len(filename) <= 255
		189
174	filepath = os.path.join(storedir, filename)	190		filepath = os.path.join(storedir, filename)
175	fout = open(filepath, 'w')	191		fout = open(filepath, 'w')
176	fout.write(check.export_TAP([result], checkname='depcheck'))	192		fout.write(check.export_TAP([result], checkname='depcheck'))
177	fout.close()	193		fout.close()
178	result.artifact = filepath	194		result.artifact = filepath
179		195
180	except OSError as e:	196		except OSError as e:
181	log.logger.error('Individual logs not saved into %s, an error occured. '	197		log.logger.error('Individual logs not saved into %s, an error occured. '
182	'Raising.', artifactsdir)	198		'Raising.', artifactsdir)
183	raise e	199		raise e
184		200