Differential D91

runner: allow arch not to be specified
ClosedPublic
Actions

Authored by kparal on May 9 2014, 12:33 PM.

Details

Reviewers
tflink
mkrizek
Commits
rLTRN8731ae554c83: runner: allow arch not to be specified
Summary

This fixes a regression from 052595d , which caused tracebacks when you
tried to execute a task without any arch specified. It also implements a
default value when this happens.

Test Plan

Before this patch:

$ runtask -i ttfautohint-1.1-1.fc20 -t bodhi_id upgradepath.yml 
[libtaskotron:logger.py:63] 2014-05-09 13:33:42 DEBUG   doing stream logging
[libtaskotron:logger.py:34] 2014-05-09 13:33:42 CRITICAL Traceback (most recent call last):
  File "/home/kparal/devel/taskotron/env_taskotron/bin/runtask", line 9, in <module>
    load_entry_point('libtaskotron==0.0.3', 'console_scripts', 'runtask')()
  File "/home/kparal/devel/taskotron/libtaskotron/libtaskotron/runner.py", line 183, in main
    arg_data['arch'] = ','.join(arg_data['arch'])
TypeError

Now it works OK. Tests adjusted.

Diff Detail

Lint
Lint Skipped
Unit
Unit Tests Skipped
tflink accepted this revision.May 9 2014, 1:23 PM

Other than finding a small bug that was probably mine, looks good to me.

testing/test_runner.py
358

I think this is a bug from my code, but this should be 'arch': ['x86_64', 'i386', 'noarch']. While you're in this code, could you fix it anyways?

kparal closed this revision.May 9 2014, 2:23 PM

Closed by commit rLTRN8731ae554c83 (authored by @kparal).

Revision Contents

Diff 257

View Options

libtaskotron/runner.py

Show First 20 Lines • Show All 119 Lines • ▼ Show 20 Line(s)107 def _validate_input(self):
120 required_input = self.taskdata['input']['args'].split(',') 120​ required_input = self.taskdata['input']['args'].split(',')
121 121​
122 for arg in required_input: 122​ for arg in required_input:
123 if not arg in self.envdata: 123​ if not arg in self.envdata:
124 raise TaskotronYamlError('Required input arg %s ' 124​ raise TaskotronYamlError('Required input arg %s '
125 'was not defined' % arg) 125​ 'was not defined' % arg)
126 126​
127 def _validate_env(self): 127​ def _validate_env(self):
128​ # TODO: implement this
128 raise NotImplementedError("Environment validation is not" 129​ raise NotImplementedError("Environment validation is not"
129 " yet implemented") 130​ " yet implemented")
130 131​
131 132​
132def get_argparser(): 133​def get_argparser():
133 parser = argparse.ArgumentParser() 134​ parser = argparse.ArgumentParser()
134 parser.add_argument("task", nargs=1, help="task to run") 135​ parser.add_argument("task", nargs=1, help="task to run")
135 parser.add_argument("-a", "--arch", 136​ parser.add_argument("-a", "--arch",
136 choices=["i386", "x86_64", "armhfp", "noarch", "all"], 137​ choices=["i386", "x86_64", "armhfp", "noarch", "all"],
137 action='append', 138​ action='append',
138 help=""" 139​ help="architecture specifying the item to be checked. If omitted, "
139 Architecture to be used; support arches are x86, x86_64, and armhfp. 140​ "defaults to noarch. 'all' specifies all known architectures.")
140 If omitted, defaults to noarch. If every architechtures are wanted 141​ parser.add_argument("-i", "--item", help="item to be checked")
141 use all. ​
142 """) ​
143 parser.add_argument("-i", "--item", help="item to be used as input") ​
144 parser.add_argument("-t", "--type", 142​ parser.add_argument("-t", "--type",
145 choices=["bodhi_id", "koji_build", "koji_tag"], 143​ choices=["bodhi_id", "koji_build", "koji_tag"],
146 help="Type of input object") 144​ help="type of --item argument")
147 parser.add_argument("-j", "--jobid", help="optional jobid used to render log urls", 145​ parser.add_argument("-j", "--jobid", default="-1",
148 default="-1") 146​ help="optional job identifier used to render log urls")
149 return parser 147​ return parser
150 148​
151 149​
152def process_args(args): 150​def process_args(args):
153 """ Transforms (item, item_type) pairs from input args into specific data 151​ """ Processes raw input args and converts them into specific data types that
154 types that can be used by tasks. 152​ can be used by tasks. This includes e.g. creating new args based on
153​ (item, item_type) pairs, or adjusting selected architecture.
155 154​
156 :param args: dictionary of raw arguments 155​ :param dict args: dictionary of raw arguments
157 :type args: dict ​
158 :returns: dict of args with appended specific data 156​ :returns: dict of args with appended specific data
159 """ 157​ """
160 158​
159​ # process item + type
161 if args['type'] == 'koji_build': 160​ if args['type'] == 'koji_build':
162 args['envr'] = args['item'] 161​ args['envr'] = args['item']
163 if args['type'] == 'bodhi_id': 162​ if args['type'] == 'bodhi_id':
164 args['bodhi_id'] = args['item'] 163​ args['bodhi_id'] = args['item']
165 if args['type'] == 'koji_tag': 164​ if args['type'] == 'koji_tag':
166 args['tag'] = args['item'] 165​ args['tag'] = args['item']
166​
167​ # process arch
168​ if args['arch'] is None:
169​ args['arch'] = ['noarch']
170​ # since lists don't play nice with yaml, convert arch to csv
171​ # this is a workaround for https://phab.qadevel.cloud.fedoraproject.org/T148
172​ args['arch'] = ','.join(args['arch'])
173​
167 return args 174​ return args
168 175​
169 176​
170def main(): 177​def main():
171 parser = get_argparser() 178​ parser = get_argparser()
172 args = parser.parse_args() 179​ args = parser.parse_args()
173 180​
174 logger.init(level=logging.DEBUG) 181​ logger.init(level=logging.DEBUG)
175 182​
176 arg_data = process_args(vars(args)) 183​ arg_data = process_args(vars(args))
177 arg_data['taskfile'] = args.task[0] 184​ arg_data['taskfile'] = args.task[0]
178 185​
179 # since lists don't play nice with yaml, convert arch to csv ​
180 # this is a workaround for https://phab.qadevel.cloud.fedoraproject.org/T148 ​
181 arg_data['arch'] = ','.join(arg_data['arch']) ​
182 ​
183 task_data = taskyaml.parse_yaml_from_file(arg_data['taskfile']) 186​ task_data = taskyaml.parse_yaml_from_file(arg_data['taskfile'])
184 187​
185 if not task_data: 188​ if not task_data:
186 raise TaskotronYamlError('Input file should not be empty') 189​ raise TaskotronYamlError('Input file should not be empty')
187 190​
188 task_runner = Runner(task_data, arg_data) 191​ task_runner = Runner(task_data, arg_data)
189 task_runner.run() 192​ task_runner.run()
190 193​
191 for output in task_runner.working_data: 194​ for output in task_runner.working_data:
192 if python_utils.listlike(task_runner.working_data[output]): 195​ if python_utils.listlike(task_runner.working_data[output]):
193 log.info("\n" + "\n".join(task_runner.working_data[output])) 196​ log.info("\n" + "\n".join(task_runner.working_data[output]))
194 else: 197​ else:
195 log.info("\n" + task_runner.working_data[output]) 198​ log.info("\n" + task_runner.working_data[output])
View Options

testing/test_runner.py

Show First 20 Lines • Show All 307 Lines • ▼ Show 20 Line(s)300 def test_runner_render_single_variable(self):
308 308​
309 test_rendered_action = test_runner._render_action(ref_action) 309​ test_rendered_action = test_runner._render_action(ref_action)
310 310​
311 assert test_rendered_action['dummy']['msg'] == ref_message 311​ assert test_rendered_action['dummy']['msg'] == ref_message
312 312​
313class TestRunnerProcessArgs(): 313​class TestRunnerProcessArgs():
314 314​
315 def test_process_args_koji_build(self): 315​ def test_process_args_koji_build(self):
316 ref_input = { 'arch': 'x86_64', 316​ ref_input = { 'arch': ['x86_64'],
317 'item': 'foo-1.2-3.fc99', 317​ 'item': 'foo-1.2-3.fc99',
318 'type': 'koji_build', 318​ 'type': 'koji_build',
319 'task': 'sometask.yml'} 319​ 'task': 'sometask.yml'}
320 320​
321 ref_args = copy.deepcopy(ref_input) 321​ ref_args = copy.deepcopy(ref_input)
322 ref_args['envr'] = 'foo-1.2-3.fc99' 322​ ref_args['envr'] = 'foo-1.2-3.fc99'
323​ ref_args['arch'] = 'x86_64'
323 324​
324 test_args = runner.process_args(ref_input) 325​ test_args = runner.process_args(ref_input)
325 326​
326 assert test_args == ref_args 327​ assert test_args == ref_args
327 328​
328 def test_process_args_bodhi_id(self): 329​ def test_process_args_bodhi_id(self):
329 ref_input = { 'arch': ['x86_64'], 330​ ref_input = { 'arch': ['x86_64'],
330 'item': 'foo-1.2-3.fc99', 331​ 'item': 'foo-1.2-3.fc99',
331 'type': 'bodhi_id', 332​ 'type': 'bodhi_id',
332 'task': 'sometask.yml'} 333​ 'task': 'sometask.yml'}
333 334​
334 ref_args = copy.deepcopy(ref_input) 335​ ref_args = copy.deepcopy(ref_input)
335 ref_args['bodhi_id'] = 'foo-1.2-3.fc99' 336​ ref_args['bodhi_id'] = 'foo-1.2-3.fc99'
337​ ref_args['arch'] = 'x86_64'
336 338​
337 test_args = runner.process_args(ref_input) 339​ test_args = runner.process_args(ref_input)
338 340​
339 assert test_args == ref_args 341​ assert test_args == ref_args
340 342​
341 def test_process_args_koji_tag(self): 343​ def test_process_args_koji_tag(self):
342 ref_input = { 'arch': ['x86_64'], 344​ ref_input = { 'arch': ['x86_64'],
343 'item': 'dist-fc99-updates', 345​ 'item': 'dist-fc99-updates',
344 'type': 'koji_tag', 346​ 'type': 'koji_tag',
345 'task': 'sometask.yml'} 347​ 'task': 'sometask.yml'}
346 348​
347 ref_args = copy.deepcopy(ref_input) 349​ ref_args = copy.deepcopy(ref_input)
348 ref_args['tag'] = 'dist-fc99-updates' 350​ ref_args['tag'] = 'dist-fc99-updates'
351​ ref_args['arch'] = 'x86_64'
349 352​
350 test_args = runner.process_args(ref_input) 353​ test_args = runner.process_args(ref_input)
351 354​
352 assert test_args == ref_args 355​ assert test_args == ref_args
353 356​
354 def test_process_args_koji_tag_multiple_arches(self): 357​ def test_process_args_koji_tag_multiple_arches(self):
355 ref_input = { 'arch': ['x86_64,i386,noarch'], 358​ ref_input = { 'arch': ['x86_64', 'i386', 'noarch'],
tflinkUnsubmitted
Not Done

I think this is a bug from my code, but this should be 'arch': ['x86_64', 'i386', 'noarch']. While you're in this code, could you fix it anyways?

356 'item': 'dist-fc99-updates', 359​ 'item': 'dist-fc99-updates',
357 'type': 'koji_tag', 360​ 'type': 'koji_tag',
358 'task': 'sometask.yml'} 361​ 'task': 'sometask.yml'}
359 362​
360 ref_args = copy.deepcopy(ref_input) 363​ ref_args = copy.deepcopy(ref_input)
361 ref_args['tag'] = 'dist-fc99-updates' 364​ ref_args['tag'] = 'dist-fc99-updates'
365​ ref_args['arch'] = 'x86_64,i386,noarch'
366​
367​ test_args = runner.process_args(ref_input)
368​
369​ assert test_args == ref_args
370​
371​ def test_process_args_no_arch(self):
372​ ref_input = { 'type': 'invalid',
373​ 'arch': None}
374​ ref_args = copy.deepcopy(ref_input)
375​ ref_args['arch'] = 'noarch'
362 376​
363 test_args = runner.process_args(ref_input) 377​ test_args = runner.process_args(ref_input)
378​ assert test_args == ref_args
364 379​
365 assert test_args == ref_args ​
366No newline at end of file ​