Differential D110

Make YAML variables and CLI arguments naming consistent
ClosedPublic
Actions

Authored by mkrizek on May 28 2014, 11:57 AM.

Details

Reviewers
kparal
tflink
jskladan
Maniphest Tasks
T129: Improve error messages for missing input to runtask
T180: Consistent YAML variables and CLI arguments naming
Commits
rLTRN45d1013b3694: Make YAML variables and CLI arguments naming consistent
Summary

Once accepted, I will amend all checks' yaml files accordingly.

Fixes T180

I believe this fixes T129 as well.

Test Plan

Run any check (do not forget to amend its yaml file) and/or test suite.

Diff Detail

Repository
rLTRN libtaskotron
Lint
Lint Skipped
Unit
Unit Tests Skipped
mkrizek retitled this revision from to Make YAML variables and CLI arguments naming consistent.May 28 2014, 11:57 AM
mkrizek updated this object.
mkrizek edited the test plan for this revision. (Show Details)
mkrizek added reviewers: tflink, kparal, jskladan.
mkrizek added tasks: T180: Consistent YAML variables and CLI arguments naming, T129: Improve error messages for missing input to runtask.
mkrizek updated this revision to Diff 311.May 28 2014, 12:07 PM

Update taskyaml docs as well

kparal requested changes to this revision.May 28 2014, 12:27 PM

It seems OK, thanks. Just a few documentation requests.

docs/source/taskyaml.rst
57–61

Could you please add a short example for each of these args? So that people know what format is expected (koji_build has two, bodhi_id has two, arch can be a list perhaps?). Thanks.

libtaskotron/directives/koji_directive.py
19

Maybe this could say:

"koji: command=download koji_build=<N(E)VR to download> arch=<desired arch>

in order to be more obvious.

69–72

If we are to stick to the terminology, this should probably say:

"Getting RPMs for %s (%s) and downloading to %s"

libtaskotron/runner.py
16

If this should be a public variable, it should have a docstring below it, so that it appears in our generated docs.

If this should be a private variable, it should start with an underscore... and it should have a docstring below/comment above it, so that it's clear what it is used for. Something like

The list of accepted item types on the command line (--type option)

This revision now requires changes to proceed.May 28 2014, 12:27 PM
tflink added a comment.May 28 2014, 12:52 PM

Looks pretty good to me other than the things kamil mentioned

libtaskotron/directives/koji_directive.py
69–72

I'm not sure I understand the advantage of that phrasing. It is downloading a koji build which is a set of 1 or more rpms, no?

kparal added inline comments.May 28 2014, 1:26 PM
libtaskotron/directives/koji_directive.py
69–72

Yes, therefore "getting koji builds for <koji build>" seems weird. A build consists of RPMs, so you can get rpms for a koji build. Or you can get koji builds for a koji tag. But you can't get koji builds for a koji build. Or am I missing something? :)

tflink added inline comments.May 28 2014, 1:37 PM
libtaskotron/directives/koji_directive.py
69–72

OK, I see what you're getting at. How about

"Getting RPMs for koji build %s (%s) and downloading to %s"

I'd prefer that it be specific on what it's downloading since an nevr can be a little ambiguous.

kparal added inline comments.May 28 2014, 2:24 PM
libtaskotron/directives/koji_directive.py
69–72

Sure, great! :)

mkrizek updated this revision to Diff 312.May 28 2014, 3:12 PM

Address comments mentioned in the review

tflink accepted this revision.May 28 2014, 4:09 PM

Looks good to me

mkrizek closed this revision.May 29 2014, 8:11 AM
mkrizek updated this revision to Diff 318.

Closed by commit rLTRN45d1013b3694 (authored by @mkrizek).

Revision Contents

Diff 318

View Options

docs/source/taskyaml.rst

Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Line(s)
46Most tasks require some form of input. The required input must be declared in 46​Most tasks require some form of input. The required input must be declared in
47order to verify that the task can be run 47​order to verify that the task can be run
48 48​
49.. code-block:: yaml 49​.. code-block:: yaml
50 50​
51 input: 51​ input:
52 args: 52​ args:
53 - arch 53​ - arch
54 - envr 54​ - koji_build
55 55​
56Valid args include: 56​Valid args include:
57 57​
58 * arch 58​ * arch (e.g.: ``x86_64``, ``[i386, x86_64]``)
59 * envr 59​ * koji_build (e.g.: ``xchat-0:2.8.8-19.fc19``, ``xchat-2.8.8-19.fc19``)
60 * bodhi_id 60​ * bodhi_id (e.g.: ``FEDORA-2013-10476``, ``xchat-2.8.8-19.fc19``)
61 * koji_tag 61​ * koji_tag (e.g.: ``f20-updates-testing-pending``)
kparalUnsubmitted
Not Done

Could you please add a short example for each of these args? So that people know what format is expected (koji_build has two, bodhi_id has two, arch can be a list perhaps?). Thanks.

62 62​
63Dependencies 63​Dependencies
64------------ 64​------------
65 65​
66A task may also require the presence of other code to support execution. Those 66​A task may also require the presence of other code to support execution. Those
67dependencies are specified as part of the environment description. 67​dependencies are specified as part of the environment description.
68 68​
69.. code-block:: yaml 69​.. code-block:: yaml
▲ Show 20 Lines • Show All 151 Lines • Show Last 20 Lines
View Options

libtaskotron/directives/koji_directive.py

1from libtaskotron.koji_utils import KojiClient 1​from libtaskotron.koji_utils import KojiClient
2from libtaskotron.logger import log 2​from libtaskotron.logger import log
3from libtaskotron.directives import BaseDirective 3​from libtaskotron.directives import BaseDirective
4from libtaskotron.exceptions import TaskotronDirectiveError 4​from libtaskotron.exceptions import TaskotronDirectiveError
5 5​
6directive_class = 'KojiDirective' 6​directive_class = 'KojiDirective'
7 7​
8class KojiDirective(BaseDirective): 8​class KojiDirective(BaseDirective):
9 """The koji directive interfaces with Koji to facilitate various koji 9​ """The koji directive interfaces with Koji to facilitate various koji
10 actions. 10​ actions.
11 11​
12 format: "koji: target_dir=<target_dir> command=[download, download_tag] <command args> 12​ format: "koji: target_dir=<target_dir> command=[download, download_tag] <command args>
13 13​
14 Valid Commands: 14​ Valid Commands:
15 15​
16 download 16​ download
17 Downloads the envr specified as "envr" 17​ Downloads the koji build specified as "koji_build"
18 format: 18​ format:
19 "koji: command=download envr=<envr to download> arch=<desired arch> 19​ "koji: command=download koji_build=<N(E)VR to download> arch=<desired arch>
kparalUnsubmitted
Not Done

Maybe this could say:

"koji: command=download koji_build=<N(E)VR to download> arch=<desired arch>

in order to be more obvious.

20 download_tag 20​ download_tag
21 Downloads rpms tagged by "tag" 21​ Downloads rpms tagged by "koji_tag"
22 format: 22​ format:
23 "koji: command=download_tag tag=<tag to download> arch=<desired arch> 23​ "koji: command=download_tag koji_tag=<koji tag to download> arch=<desired arch>
24 """ 24​ """
25 25​
26 def __init__(self, koji_session=None): 26​ def __init__(self, koji_session=None):
27 super(KojiDirective, self).__init__() 27​ super(KojiDirective, self).__init__()
28 if koji_session is None: 28​ if koji_session is None:
29 self.koji = KojiClient(koji_session) 29​ self.koji = KojiClient(koji_session)
30 else: 30​ else:
31 self.koji = koji_session 31​ self.koji = koji_session
Show All 22 Lines33 def process(self, input_data, env_data):
54 54​
55 self.arches = input_data['arch'] 55​ self.arches = input_data['arch']
56 56​
57 # https://phab.qadevel.cloud.fedoraproject.org/T155 57​ # https://phab.qadevel.cloud.fedoraproject.org/T155
58 if 'noarch' not in self.arches: 58​ if 'noarch' not in self.arches:
59 self.arches.append('noarch') 59​ self.arches.append('noarch')
60 60​
61 if action == 'download': 61​ if action == 'download':
62 if 'envr' not in input_data: 62​ if 'koji_build' not in input_data:
63 detected_args = ', '.join(input_data.keys()) 63​ detected_args = ', '.join(input_data.keys())
64 raise TaskotronDirectiveError( 64​ raise TaskotronDirectiveError(
65 "The koji directive requires 'envr' for the 'download'" 65​ "The koji directive requires 'koji_build' for the 'download'"
66 "action. Detected arguments: %s" % detected_args) 66​ "action. Detected arguments: %s" % detected_args)
67 67​
68 envr = input_data['envr'] 68​ koji_build = input_data['koji_build']
69 69​
70 log.info("getting koji builds for %s (%s) and downloading to %s", 70​ log.info("Getting RPMs for koji build %s (%s) and downloading to %s",
71 envr, str(self.arches), self.target_dir) 71​ koji_build, str(self.arches), self.target_dir)
72 output_data['downloaded_rpms'] = self.koji.get_nvr_rpms(envr, 72​ output_data['downloaded_rpms'] = self.koji.get_nvr_rpms(koji_build,
kparalUnsubmitted
Not Done

If we are to stick to the terminology, this should probably say:

"Getting RPMs for %s (%s) and downloading to %s"

tflinkUnsubmitted
Not Done

I'm not sure I understand the advantage of that phrasing. It is downloading a koji build which is a set of 1 or more rpms, no?

kparalUnsubmitted
Not Done

Yes, therefore "getting koji builds for <koji build>" seems weird. A build consists of RPMs, so you can get rpms for a koji build. Or you can get koji builds for a koji tag. But you can't get koji builds for a koji build. Or am I missing something? :)

tflinkUnsubmitted
Not Done

OK, I see what you're getting at. How about

"Getting RPMs for koji build %s (%s) and downloading to %s"

I'd prefer that it be specific on what it's downloading since an nevr can be a little ambiguous.

kparalUnsubmitted
Not Done

Sure, great! :)

73 self.target_dir, 73​ self.target_dir,
74 self.arches) 74​ self.arches)
75 elif action == 'download_tag': 75​ elif action == 'download_tag':
76 if 'tag' not in input_data: 76​ if 'koji_tag' not in input_data:
77 detected_args = ', '.join(input_data.keys()) 77​ detected_args = ', '.join(input_data.keys())
78 raise TaskotronDirectiveError( 78​ raise TaskotronDirectiveError(
79 "The koji directive requires 'tag' for the 'download_tag'" 79​ "The koji directive requires 'koji_tag' for the 'download_tag'"
80 "action. Detected arguments: %s" % detected_args) 80​ "action. Detected arguments: %s" % detected_args)
81 81​
82 tag = input_data['tag'] 82​ koji_tag = input_data['koji_tag']
83 83​
84 log.info("getting koji builds for tag '%s', arches '%s' and " 84​ log.info("Getting koji builds for koji tag '%s', arches '%s' and "
85 "downloading to %s", tag, str(self.arches), self.target_dir) 85​ "downloading to %s", koji_tag, str(self.arches), self.target_dir)
86 output_data['downloaded_rpms'] = self.koji.get_tagged_rpms(tag, 86​ output_data['downloaded_rpms'] = self.koji.get_tagged_rpms(koji_tag,
87 self.target_dir, 87​ self.target_dir,
88 self.arches) 88​ self.arches)
89 89​
90 return output_data 90​ return output_data
View Options

libtaskotron/runner.py

1import logging 1​import logging
2import tempfile 2​import tempfile
3import os.path 3​import os.path
4import argparse 4​import argparse
5import imp 5​import imp
6import copy 6​import copy
7 7​
8from libtaskotron import taskyaml 8​from libtaskotron import taskyaml
9from libtaskotron import logger 9​from libtaskotron import logger
10from libtaskotron import python_utils 10​from libtaskotron import python_utils
11from libtaskotron import config 11​from libtaskotron import config
12from libtaskotron.logger import log 12​from libtaskotron.logger import log
13from libtaskotron.exceptions import TaskotronYamlError 13​from libtaskotron.exceptions import TaskotronYamlError
14 14​
15​
16​# The list of accepted item types on the command line (--type option)
kparalUnsubmitted
Not Done

If this should be a public variable, it should have a docstring below it, so that it appears in our generated docs.

If this should be a private variable, it should start with an underscore... and it should have a docstring below/comment above it, so that it's clear what it is used for. Something like

The list of accepted item types on the command line (--type option)

17​_ITEM_TYPES = ["bodhi_id", "koji_build", "koji_tag"]
18​
19​
15class Runner(object): 20​class Runner(object):
16 def __init__(self, taskdata, argdata, workdir=None): 21​ def __init__(self, taskdata, argdata, workdir=None):
17 self.taskdata = taskdata 22​ self.taskdata = taskdata
18 self.envdata = argdata 23​ self.envdata = argdata
19 self.working_data = {} 24​ self.working_data = {}
20 self.directives = {} 25​ self.directives = {}
21 self.workdir = workdir or tempfile.mkdtemp(prefix="task-", 26​ self.workdir = workdir or tempfile.mkdtemp(prefix="task-",
22 dir=config.get_config().tmpdir) 27​ dir=config.get_config().tmpdir)
▲ Show 20 Lines • Show All 73 Lines • ▼ Show 20 Line(s)
96 101​
97 def do_actions(self): 102​ def do_actions(self):
98 '''Sequentially run all actions for a task. An 'action' is a single step 103​ '''Sequentially run all actions for a task. An 'action' is a single step
99 under the ``task:`` key. An example action looks like:: 104​ under the ``task:`` key. An example action looks like::
100 105​
101 - name: download rpms from koji 106​ - name: download rpms from koji
102 koji: 107​ koji:
103 action: download 108​ action: download
104 envr: $envr 109​ koji_build: $koji_build
105 arch: $arch 110​ arch: $arch
106 ''' 111​ '''
107 if 'task' not in self.taskdata or not self.taskdata['task']: 112​ if 'task' not in self.taskdata or not self.taskdata['task']:
108 raise TaskotronYamlError("At least one task should be specified" 113​ raise TaskotronYamlError("At least one task should be specified"
109 " in input yaml file") 114​ " in input yaml file")
110 115​
111 for action in self.taskdata['task']: 116​ for action in self.taskdata['task']:
112 self.do_single_action(action) 117​ self.do_single_action(action)
Show All 29 Lines145def get_argparser():
142 parser.add_argument("task", nargs=1, help="task to run") 147​ parser.add_argument("task", nargs=1, help="task to run")
143 parser.add_argument("-a", "--arch", 148​ parser.add_argument("-a", "--arch",
144 choices=["i386", "x86_64", "armhfp", "noarch", "all"], 149​ choices=["i386", "x86_64", "armhfp", "noarch", "all"],
145 action='append', 150​ action='append',
146 help="architecture specifying the item to be checked. If omitted, " 151​ help="architecture specifying the item to be checked. If omitted, "
147 "defaults to noarch. 'all' specifies all known architectures.") 152​ "defaults to noarch. 'all' specifies all known architectures.")
148 parser.add_argument("-i", "--item", help="item to be checked") 153​ parser.add_argument("-i", "--item", help="item to be checked")
149 parser.add_argument("-t", "--type", 154​ parser.add_argument("-t", "--type",
150 choices=["bodhi_id", "koji_build", "koji_tag"], 155​ choices=_ITEM_TYPES,
151 help="type of --item argument") 156​ help="type of --item argument")
152 parser.add_argument("-j", "--jobid", default="-1", 157​ parser.add_argument("-j", "--jobid", default="-1",
153 help="optional job identifier used to render log urls") 158​ help="optional job identifier used to render log urls")
154 return parser 159​ return parser
155 160​
156 161​
157def process_args(args): 162​def process_args(args):
158 """ Processes raw input args and converts them into specific data types that 163​ """ Processes raw input args and converts them into specific data types that
159 can be used by tasks. This includes e.g. creating new args based on 164​ can be used by tasks. This includes e.g. creating new args based on
160 (item, item_type) pairs, or adjusting selected architecture. 165​ (item, item_type) pairs, or adjusting selected architecture.
161 166​
162 :param dict args: dictionary of raw arguments 167​ :param dict args: dictionary of raw arguments
163 :returns: dict of args with appended specific data 168​ :returns: dict of args with appended specific data
164 """ 169​ """
165 170​
166 # process item + type 171​ # process item + type
167 if args['type'] == 'koji_build': 172​ if args['type'] in _ITEM_TYPES:
168 args['envr'] = args['item'] 173​ args[args['type']] = args['item']
169 if args['type'] == 'bodhi_id': ​
170 args['bodhi_id'] = args['item'] ​
171 if args['type'] == 'koji_tag': ​
172 args['tag'] = args['item'] ​
173 174​
174 # process arch 175​ # process arch
175 if args['arch'] is None: 176​ if args['arch'] is None:
176 args['arch'] = ['noarch'] 177​ args['arch'] = ['noarch']
177 178​
178 return args 179​ return args
179 180​
180 181​
Show All 23 Lines
View Options

testing/test_koji_directive.py

Show All 33 Lines6 def setup_method(self, method):
34 34​
35 self.ref_rpms = ['/var/tmp/fake/%s.%s.rpm' 35​ self.ref_rpms = ['/var/tmp/fake/%s.%s.rpm'
36 % (self.ref_nvr, self.ref_arch)] 36​ % (self.ref_nvr, self.ref_arch)]
37 37​
38 def test_parse_download_command(self): 38​ def test_parse_download_command(self):
39 39​
40 self.ref_input = {'action': 'download', 40​ self.ref_input = {'action': 'download',
41 'arch': self.ref_arch, 41​ 'arch': self.ref_arch,
42 'envr': self.ref_nvr} 42​ 'koji_build': self.ref_nvr}
43 43​
44 stub_koji = Dingus(get_nvr_rpms__returns = self.ref_rpms) 44​ stub_koji = Dingus(get_nvr_rpms__returns = self.ref_rpms)
45 45​
46 test_helper = koji_directive.KojiDirective(stub_koji) 46​ test_helper = koji_directive.KojiDirective(stub_koji)
47 47​
48 test_helper.process(self.ref_input, self.ref_envdata) 48​ test_helper.process(self.ref_input, self.ref_envdata)
49 49​
50 getrpm_calls = stub_koji.calls() 50​ getrpm_calls = stub_koji.calls()
51 requested_nvr = getrpm_calls[0][1][0] 51​ requested_nvr = getrpm_calls[0][1][0]
52 52​
53 assert len(getrpm_calls) == 1 53​ assert len(getrpm_calls) == 1
54 assert requested_nvr == self.ref_nvr 54​ assert requested_nvr == self.ref_nvr
55 55​
56 def test_parse_download_tag_command(self): 56​ def test_parse_download_tag_command(self):
57 57​
58 self.ref_input = {'action': 'download_tag', 58​ self.ref_input = {'action': 'download_tag',
59 'arch': self.ref_arch, 59​ 'arch': self.ref_arch,
60 'tag': self.ref_tag} 60​ 'koji_tag': self.ref_tag}
61 61​
62 stub_koji = Dingus(get_tagged_rpms__returns=self.ref_rpms) 62​ stub_koji = Dingus(get_tagged_rpms__returns=self.ref_rpms)
63 63​
64 test_helper = koji_directive.KojiDirective(stub_koji) 64​ test_helper = koji_directive.KojiDirective(stub_koji)
65 65​
66 test_helper.process(self.ref_input, self.ref_envdata) 66​ test_helper.process(self.ref_input, self.ref_envdata)
67 67​
68 getrpm_calls = stub_koji.calls() 68​ getrpm_calls = stub_koji.calls()
69 requested_tag = getrpm_calls[0][1][0] 69​ requested_tag = getrpm_calls[0][1][0]
70 70​
71 assert len(getrpm_calls) == 1 71​ assert len(getrpm_calls) == 1
72 assert requested_tag == self.ref_tag 72​ assert requested_tag == self.ref_tag
73 73​
74 def test_parse_multiple_arches(self): 74​ def test_parse_multiple_arches(self):
75 self.ref_arch = ['noarch', 'i386'] 75​ self.ref_arch = ['noarch', 'i386']
76 76​
77 self.ref_input = {'action': 'download_tag', 77​ self.ref_input = {'action': 'download_tag',
78 'arch': self.ref_arch, 78​ 'arch': self.ref_arch,
79 'tag': self.ref_tag} 79​ 'koji_tag': self.ref_tag}
80 80​
81 stub_koji = Dingus('koji_utils') 81​ stub_koji = Dingus('koji_utils')
82 82​
83 test_helper = koji_directive.KojiDirective(stub_koji) 83​ test_helper = koji_directive.KojiDirective(stub_koji)
84 test_helper.process(self.ref_input, self.ref_envdata) 84​ test_helper.process(self.ref_input, self.ref_envdata)
85 85​
86 assert test_helper.arches == self.ref_arch 86​ assert test_helper.arches == self.ref_arch
87 87​
88 def test_parse_single_arch(self): 88​ def test_parse_single_arch(self):
89 self.ref_input = {'action': 'download_tag', 89​ self.ref_input = {'action': 'download_tag',
90 'arch': self.ref_arch, 90​ 'arch': self.ref_arch,
91 'tag': self.ref_tag} 91​ 'koji_tag': self.ref_tag}
92 92​
93 stub_koji = Dingus('koji_utils') 93​ stub_koji = Dingus('koji_utils')
94 94​
95 test_helper = koji_directive.KojiDirective(stub_koji) 95​ test_helper = koji_directive.KojiDirective(stub_koji)
96 test_helper.process(self.ref_input, self.ref_envdata) 96​ test_helper.process(self.ref_input, self.ref_envdata)
97 97​
98 assert test_helper.arches == self.ref_arch 98​ assert test_helper.arches == self.ref_arch
99 99​
100 def test_add_noarch_download_command(self): 100​ def test_add_noarch_download_command(self):
101 ref_input = {'action': 'download', 'arch': ['x86_64'], 101​ ref_input = {'action': 'download', 'arch': ['x86_64'],
102 'envr': self.ref_nvr} 102​ 'koji_build': self.ref_nvr}
103 ref_envdata = {'workdir': '/var/tmp/foo'} 103​ ref_envdata = {'workdir': '/var/tmp/foo'}
104 104​
105 stub_koji = Dingus() 105​ stub_koji = Dingus()
106 test_helper = koji_directive.KojiDirective(stub_koji) 106​ test_helper = koji_directive.KojiDirective(stub_koji)
107 test_helper.process(ref_input, ref_envdata) 107​ test_helper.process(ref_input, ref_envdata)
108 108​
109 getrpm_calls = stub_koji.calls() 109​ getrpm_calls = stub_koji.calls()
110 print getrpm_calls 110​ print getrpm_calls
111 requested_arches = getrpm_calls[0][1][2] 111​ requested_arches = getrpm_calls[0][1][2]
112 112​
113 assert len(getrpm_calls) == 1 113​ assert len(getrpm_calls) == 1
114 assert 'x86_64' in requested_arches 114​ assert 'x86_64' in requested_arches
115 assert 'noarch' in requested_arches 115​ assert 'noarch' in requested_arches
116 116​
117 def test_add_noarch_download_tag_command(self): 117​ def test_add_noarch_download_tag_command(self):
118 ref_input = {'action': 'download_tag', 'arch': ['x86_64'], 118​ ref_input = {'action': 'download_tag', 'arch': ['x86_64'],
119 'tag': self.ref_tag} 119​ 'koji_tag': self.ref_tag}
120 ref_envdata = {'workdir': '/var/tmp/foo'} 120​ ref_envdata = {'workdir': '/var/tmp/foo'}
121 121​
122 stub_koji = Dingus(get_tagged_rpms__returns=self.ref_rpms) 122​ stub_koji = Dingus(get_tagged_rpms__returns=self.ref_rpms)
123 test_helper = koji_directive.KojiDirective(stub_koji) 123​ test_helper = koji_directive.KojiDirective(stub_koji)
124 test_helper.process(ref_input, ref_envdata) 124​ test_helper.process(ref_input, ref_envdata)
125 125​
126 getrpm_calls = stub_koji.calls() 126​ getrpm_calls = stub_koji.calls()
127 requested_arches = getrpm_calls[0][1][2] 127​ requested_arches = getrpm_calls[0][1][2]
128 128​
129 assert len(getrpm_calls) == 1 129​ assert len(getrpm_calls) == 1
130 assert 'x86_64' in requested_arches 130​ assert 'x86_64' in requested_arches
131 assert 'noarch' in requested_arches 131​ assert 'noarch' in requested_arches
View Options

testing/test_runner.py

1import pytest 1​import pytest
2import os 2​import os
3import sys 3​import sys
4import copy 4​import copy
5 5​
6from libtaskotron import runner 6​from libtaskotron import runner
7from libtaskotron.exceptions import TaskotronYamlError 7​from libtaskotron.exceptions import TaskotronYamlError
8 8​
9 9​
10class TestRunnerInputVerify(): 10​class TestRunnerInputVerify():
11 def test_yamlrunner_valid_input(self): 11​ def test_yamlrunner_valid_input(self):
12 ref_cmd = '-i foo-1.2-3.fc99 -t koji_build -a x86_64 footask.yml' 12​ ref_cmd = '-i foo-1.2-3.fc99 -t koji_build -a x86_64 footask.yml'
13 ref_argdata = {'input': {'args': ['envr', 'arch']}} 13​ ref_argdata = {'input': {'args': ['koji_build', 'arch']}}
14 14​
15 test_parser = runner.get_argparser() 15​ test_parser = runner.get_argparser()
16 test_input_args = vars(test_parser.parse_args(ref_cmd.split())) 16​ test_input_args = vars(test_parser.parse_args(ref_cmd.split()))
17 test_args = runner.process_args(test_input_args) 17​ test_args = runner.process_args(test_input_args)
18 18​
19 test_runner = runner.Runner(ref_argdata, test_args) 19​ test_runner = runner.Runner(ref_argdata, test_args)
20 20​
21 test_runner._validate_input() 21​ test_runner._validate_input()
▲ Show 20 Lines • Show All 73 Lines • ▼ Show 20 Line(s)87 def test_yamlrunner_fails_input_is_string(self):
95 test_runner = runner.Runner(ref_inputspec, test_args) 95​ test_runner = runner.Runner(ref_inputspec, test_args)
96 96​
97 with pytest.raises(TaskotronYamlError): 97​ with pytest.raises(TaskotronYamlError):
98 test_runner._validate_input() 98​ test_runner._validate_input()
99 99​
100class TestRunnerSetup(): 100​class TestRunnerSetup():
101 def test_trivial_creation(self, tmpdir): 101​ def test_trivial_creation(self, tmpdir):
102 ref_taskdata = {'preparation': {'koji': 'download envr'}, 102​ ref_taskdata = {'preparation': {'koji': 'download envr'},
103 'input': {'args': ['envr','arch']}, 103​ 'input': {'args': ['koji_build','arch']},
104 'post': {'shell': 'clean'}, 104​ 'post': {'shell': 'clean'},
105 'execution': {'python': 'run_rpmlint.py'}, 105​ 'execution': {'python': 'run_rpmlint.py'},
106 'dependencies': ['rpmlint', 'libtaskbot']} 106​ 'dependencies': ['rpmlint', 'libtaskbot']}
107 ref_inputdata = {} 107​ ref_inputdata = {}
108 108​
109 test_runner = runner.Runner(ref_taskdata, ref_inputdata, tmpdir) 109​ test_runner = runner.Runner(ref_taskdata, ref_inputdata, tmpdir)
110 110​
111 assert test_runner.taskdata == ref_taskdata 111​ assert test_runner.taskdata == ref_taskdata
▲ Show 20 Lines • Show All 235 Lines • ▼ Show 20 Line(s)346class TestRunnerProcessArgs():
347 347​
348 def test_process_args_koji_build(self): 348​ def test_process_args_koji_build(self):
349 ref_input = { 'arch': ['x86_64'], 349​ ref_input = { 'arch': ['x86_64'],
350 'item': 'foo-1.2-3.fc99', 350​ 'item': 'foo-1.2-3.fc99',
351 'type': 'koji_build', 351​ 'type': 'koji_build',
352 'task': 'sometask.yml'} 352​ 'task': 'sometask.yml'}
353 353​
354 ref_args = copy.deepcopy(ref_input) 354​ ref_args = copy.deepcopy(ref_input)
355 ref_args['envr'] = 'foo-1.2-3.fc99' 355​ ref_args['koji_build'] = 'foo-1.2-3.fc99'
356 356​
357 test_args = runner.process_args(ref_input) 357​ test_args = runner.process_args(ref_input)
358 358​
359 assert test_args == ref_args 359​ assert test_args == ref_args
360 360​
361 def test_process_args_bodhi_id(self): 361​ def test_process_args_bodhi_id(self):
362 ref_input = { 'arch': ['x86_64'], 362​ ref_input = { 'arch': ['x86_64'],
363 'item': 'foo-1.2-3.fc99', 363​ 'item': 'foo-1.2-3.fc99',
Show All 9 Lines
373 373​
374 def test_process_args_koji_tag(self): 374​ def test_process_args_koji_tag(self):
375 ref_input = { 'arch': ['x86_64'], 375​ ref_input = { 'arch': ['x86_64'],
376 'item': 'dist-fc99-updates', 376​ 'item': 'dist-fc99-updates',
377 'type': 'koji_tag', 377​ 'type': 'koji_tag',
378 'task': 'sometask.yml'} 378​ 'task': 'sometask.yml'}
379 379​
380 ref_args = copy.deepcopy(ref_input) 380​ ref_args = copy.deepcopy(ref_input)
381 ref_args['tag'] = 'dist-fc99-updates' 381​ ref_args['koji_tag'] = 'dist-fc99-updates'
382 382​
383 test_args = runner.process_args(ref_input) 383​ test_args = runner.process_args(ref_input)
384 384​
385 assert test_args == ref_args 385​ assert test_args == ref_args
386 386​
387 def test_process_args_koji_tag_multiple_arches(self): 387​ def test_process_args_koji_tag_multiple_arches(self):
388 ref_input = { 'arch': ['x86_64', 'i386', 'noarch'], 388​ ref_input = { 'arch': ['x86_64', 'i386', 'noarch'],
389 'item': 'dist-fc99-updates', 389​ 'item': 'dist-fc99-updates',
390 'type': 'koji_tag', 390​ 'type': 'koji_tag',
391 'task': 'sometask.yml'} 391​ 'task': 'sometask.yml'}
392 392​
393 ref_args = copy.deepcopy(ref_input) 393​ ref_args = copy.deepcopy(ref_input)
394 ref_args['tag'] = 'dist-fc99-updates' 394​ ref_args['koji_tag'] = 'dist-fc99-updates'
395 395​
396 test_args = runner.process_args(ref_input) 396​ test_args = runner.process_args(ref_input)
397 397​
398 assert test_args == ref_args 398​ assert test_args == ref_args
399 399​
400 def test_process_args_no_arch(self): 400​ def test_process_args_no_arch(self):
401 ref_input = { 'type': 'invalid', 401​ ref_input = { 'type': 'invalid',
402 'arch': None} 402​ 'arch': None}
403 ref_args = copy.deepcopy(ref_input) 403​ ref_args = copy.deepcopy(ref_input)
404 ref_args['arch'] = ['noarch'] 404​ ref_args['arch'] = ['noarch']
405 405​
406 test_args = runner.process_args(ref_input) 406​ test_args = runner.process_args(ref_input)
407 assert test_args == ref_args 407​ assert test_args == ref_args
408 408​
View Options

testing/test_taskyaml.py

Show All 10 Lines
11from libtaskotron import taskyaml 11​from libtaskotron import taskyaml
12import libtaskotron.exceptions as exc 12​import libtaskotron.exceptions as exc
13 13​
14 14​
15ref_taskname = 'testtask' 15​ref_taskname = 'testtask'
16ref_taskdesc = 'this is a test task' 16​ref_taskdesc = 'this is a test task'
17ref_maintainer = 'testuser' 17​ref_maintainer = 'testuser'
18ref_deps = ['libtaskotron', 'libpanacea'] 18​ref_deps = ['libtaskotron', 'libpanacea']
19ref_input = {'args': 'arch, envr'} 19​ref_input = {'args': 'arch, koji_build'}
20ref_actions = [] 20​ref_actions = []
21 21​
22 22​
23def create_yamldata(name=ref_taskname, desc=ref_taskdesc, maint=ref_maintainer, 23​def create_yamldata(name=ref_taskname, desc=ref_taskdesc, maint=ref_maintainer,
24 deps=ref_deps, input_=ref_input, actions=ref_actions): 24​ deps=ref_deps, input_=ref_input, actions=ref_actions):
25 return {'name': name, 25​ return {'name': name,
26 'desc': desc, 26​ 'desc': desc,
27 'maintainer': maint, 27​ 'maintainer': maint,
▲ Show 20 Lines • Show All 161 Lines • Show Last 20 Lines