Fixing regression of D29
ClosedPublic
Actions

Authored by lbrabec on Apr 10 2014, 9:23 AM.

Details

Reviewers

kparal
mkrizek

Maniphest Tasks

T95: Make task output in the runner more readable

Commits

rLTRNe82c9ecbbd60: Log tap output properly, don't print strings per-character

Summary

D29 regression fix brought regression elsewhere, this should fix it.

Test Plan

$ python runtask.py -e xchat-2.8.8-21.fc20 -a x86_64 yaml_file
where yaml_file is YAML file (e.g. rpmlint.yml from task-rpmlint repo.

$ python runtask.py -e tigervnc-1.3.0-14.fc20 -a x86_64 ../task-examplebodhi/examplebodhi.yml

Output should look as expected.

Diff Detail

Lint

Lint Skipped

Unit

Unit Tests Skipped

Can you please investigate why task_runner.working_data[output] is sometimes a string and sometimes a list? Is it a bug? Can we make it better somewhere? Thanks.

libtaskotron/runner.py
187–190	`python_utils.listlike()` would be safer here

using listlike from python_utils

Can you please investigate why task_runner.working_data[output] is sometimes a string and sometimes a list? Is it a bug? Can we make it better somewhere? Thanks.

Just to keep the Phab processes happy, this is still waiting on the request above.

Because we need something working soon, I'm going to accept and commit this patch, and @lbrabec will prepare a proper fix as a new review request.

mkrizek accepted this revision.Apr 29 2014, 9:58 AM

Closed by commit rLTRNe82c9ecbbd60 (authored by @lbrabec, committed by @kparal).

@tflink, this is another patch we need to have deployed on staging.

Revision Contents

			Path
M			libtaskotron/runner.py (6 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	128	2f2c7cd		Apr 10 2014, 9:20 AM	★	★
Diff 2	141	2f2c7cd	- using listlike from python_utils	Apr 15 2014, 6:20 AM	★	★
Diff 3	209	bb93fe1	Commit rLTRNe82c9ecbbd6074c2d863b7c4e2d62f1634857d26	Apr 29 2014, 10:02 AM	★	★

Commit	Tree	Parents	Author	Summary	Date
3a580c3143e8	c24ed103eeb4	cfb63bb45798	Lukas Brabec	using listlike from python_utils	Apr 15 2014, 6:20 AM
cfb63bb45798	a9a430b27c50	2f2c7cd957c1	Lukas Brabec	fixing output regression	Apr 10 2014, 9:17 AM

Diff 209

View Options

libtaskotron/runner.py

1	import logging	1		import logging
2	import tempfile	2		import tempfile
3	import os.path	3		import os.path
4	import argparse	4		import argparse
5	import imp	5		import imp
6	from jinja2 import Environment	6		from jinja2 import Environment
7	import copy	7		import copy
8		8
9	from libtaskotron import taskyaml	9		from libtaskotron import taskyaml
10	from libtaskotron import logger	10		from libtaskotron import logger
		11		from libtaskotron import python_utils
11	from libtaskotron.logger import log	12		from libtaskotron.logger import log
12	from libtaskotron.exceptions import TaskotronYamlError	13		from libtaskotron.exceptions import TaskotronYamlError
13		14
14	class Runner(object):	15		class Runner(object):
15	def __init__(self, taskdata, argdata, workdir=None):	16		def __init__(self, taskdata, argdata, workdir=None):
16	self.taskdata = taskdata	17		self.taskdata = taskdata
17	self.envdata = argdata	18		self.envdata = argdata
18	self.working_data = {}	19		self.working_data = {}
▲ Show 20 Lines • Show All 159 Lines • ▼ Show 20 Line(s)		169	def main():
178		179
179	if not task_data:	180		if not task_data:
180	raise TaskotronYamlError('Input file should not be empty')	181		raise TaskotronYamlError('Input file should not be empty')
181		182
182	task_runner = Runner(task_data, arg_data)	183		task_runner = Runner(task_data, arg_data)
183	task_runner.run()	184		task_runner.run()
184		185
185	for output in task_runner.working_data:	186		for output in task_runner.working_data:
186	log.info("\n" + "\n".join(task_runner.working_data[output]))	187		if python_utils.listlike(task_runner.working_data[output]):
		188		log.info("\n" + "\n".join(task_runner.working_data[output]))
		189		else:
		190		log.info("\n" + task_runner.working_data[output])
			kparalUnsubmitted Not Done `python_utils.listlike()` would be safer here