Differential D4

changing structure of yaml parsing code and adding simple checks
ClosedPublic
Actions

Authored by tflink on Feb 5 2014, 8:15 PM.

Details

Reviewers
kparal
jskladan
Commits
rLTRN1e29409149c8: removing not-needed preset of yaml data
rLTRNa196da5d0174: changing structure of yaml parsing code and adding simple checks
Summary

some minor changes to how yaml is parsed and adding some simple checks

Test Plan

Some local testing, not much to do until there are runner changes

Diff Detail

Lint
Lint Skipped
Unit
Unit Tests Skipped
kparal added a comment.Feb 6 2014, 9:36 AM

Looks OK, except for the one inline comment.

libtaskotron/taskyaml.py
5

I'm not sure why this line is present. It is either overwritten in the try: block, or it is never used, because an exception occurs and the return statement is never reached. If you really want to return this value, the return statement must be a part of the finally: block.

But I think we want to throw an exception rather than return 'not parsed' to the caller, right?

kparal requested changes to this revision.Feb 6 2014, 11:58 AM
tflink added a comment.Feb 6 2014, 5:08 PM

I'll update the diff shortly

libtaskotron/taskyaml.py
5

yeah, it made sense when I wrote it. I'll remove the line

tflink updated this revision.Feb 6 2014, 5:10 PM
  • removing not-needed preset of yaml data
kparal accepted this revision.Feb 10 2014, 11:55 AM

OK, looks good.

tflink closed this revision.Feb 10 2014, 8:32 PM

Closed by commit rLTRNa196da5d0174 (authored by @tflink).

Revision Contents

Diff 11

View Options

libtaskotron/runner.py

Show First 20 Lines • Show All 114 Lines • ▼ Show 20 Line(s)112 parser.add_argument("-a", "--arch", choices=["i386", "x86_64", "armhfp", "noarch"], help="""
115 """) 115​ """)
116 parser.add_argument("-e", "--envr", help="envr to be used as input") 116​ parser.add_argument("-e", "--envr", help="envr to be used as input")
117 return parser 117​ return parser
118 118​
119def main(): 119​def main():
120 parser = get_argparser() 120​ parser = get_argparser()
121 args = parser.parse_args() 121​ args = parser.parse_args()
122 122​
123 task_data = taskyaml.get_yaml_data(args.task[0]) 123​ task_data = taskyaml.parse_yaml_from_file(args.task[0])
124 124​
125 print "task data: %s" % str(task_data) 125​ print "task data: %s" % str(task_data)
126 126​
127 input_data = process_input(task_data['input'], args) 127​ input_data = process_input(task_data['input'], args)
128 128​
129 print "input data: %s" % str(input_data) 129​ print "input data: %s" % str(input_data)
130 130​
131 task_runner = Runner(task_data, input_data) 131​ task_runner = Runner(task_data, input_data)
132 task_runner.run() 132​ task_runner.run()
133 133​
134 for result in task_runner.working_data['exec_output']: 134​ for result in task_runner.working_data['exec_output']:
135 print result 135​ print result
View Options

libtaskotron/taskyaml.py

1import yaml 1​import yaml
2 2​
3 3​
4def get_yaml_data(filename): 4​def parse_yaml_from_file(filename):
5 datafile = open(filename, 'r') 5​ data = 'not parsed'
kparalUnsubmitted
Not Done

I'm not sure why this line is present. It is either overwritten in the try: block, or it is never used, because an exception occurs and the return statement is never reached. If you really want to return this value, the return statement must be a part of the finally: block.

But I think we want to throw an exception rather than return 'not parsed' to the caller, right?

tflinkAuthorUnsubmitted
Not Done

yeah, it made sense when I wrote it. I'll remove the line

6 data = yaml.safe_load(datafile.read()) 6​ try:
7 datafile.close() 7​ datafile = open(filename, 'r')
8​ data = parse_yaml(datafile.read())
9​ finally:
10​ datafile.close()
11​
8 return data 12​ return data
9 13​
10 14​
15​def parse_yaml(contents):
16​ return yaml.safe_load(contents)
11 17​
View Options

testing/test_taskyaml.py

  • This file was added.
1​import yaml
2​
3​from libtaskotron import taskyaml
4​
5​ref_filename = '/home/testuser/testtask.yml'
6​ref_taskname = 'testtask'
7​ref_taskdesc = 'this is a test task'
8​ref_maintainer = 'testuser'
9​ref_deps = ['libtaskotron', 'libpanacea']
10​ref_input = {'args': 'arch, envr'}
11​ref_actions = []
12​
13​
14​def create_yamldata(name=ref_taskname, desc=ref_taskdesc, maint= ref_maintainer,
15​ deps=ref_deps, input=ref_input, actions=ref_actions):
16​ return {'name': name,
17​ 'desc': desc,
18​ 'maintainer': maint,
19​ 'deps': deps,
20​ 'input': input,
21​ 'task': actions}
22​
23​
24​class TestTaskYamlMetadata(object):
25​ def setup_method(self, method):
26​ self.taskdata = create_yamldata()
27​ self.test_task = taskyaml.parse_yaml(yaml.safe_dump(self.taskdata))
28​
29​ def test_taskyaml_taskname(self):
30​ assert self.test_task['name'] == self.taskdata['name']
31​
32​ def test_taskyaml_taskdesc(self):
33​ assert self.test_task['desc'] == self.taskdata['desc']
34​
35​ def test_taskyaml_taskmaintainer(self):
36​ assert self.test_task['maintainer'] == self.taskdata['maintainer']
37​
38​ def test_taskyaml_taskdeps(self):
39​ assert self.test_task['deps'] == self.taskdata['deps']
40​
41​ def test_taskyaml_taskinput(self):
42​ assert self.test_task['input'] == self.taskdata['input']
43​
44​
45​class TestTaskYamlActionsNoVariables(object):
46​ def test_taskyaml_simple_action(self):
47​ ref_action = {'name': 'testaction', 'action': {'key': 'value'}}
48​ taskdata = create_yamldata(actions=[ref_action])
49​
50​ test_task = taskyaml.parse_yaml(yaml.safe_dump(taskdata))
51​
52​ assert test_task['task'][0] == ref_action
53​
54​ def test_taskyaml_multiple_actions(self):
55​ ref_action = {'name': 'testaction', 'action': {'key': 'value'}}
56​ taskdata = create_yamldata(actions=[ref_action, ref_action, ref_action])
57​
58​ test_task = taskyaml.parse_yaml(yaml.safe_dump(taskdata))
59​
60​ assert len(test_task['task']) == 3