Differential D81

changing runner, koji_directive and bodhi_directive to support multiple arch downloads. Fixes T156
ClosedPublic
Actions

Authored by tflink on May 5 2014, 7:09 PM.

Details

Reviewers
kparal
mkrizek
jskladan
Maniphest Tasks
T156: runner needs to be able to handle multiple arches
Commits
rLTRN052595dc7c0f: changing runner, koji_directive and bodhi_directive to support multiple arch…
Summary

fixing runner to support multiple arches, working around issue with inserting lists into jinja variables

Test Plan

updated and extended unit tests, tested locally

Diff Detail

Lint
Lint Skipped
Unit
Unit Tests Skipped
jskladan accepted this revision.May 6 2014, 8:18 AM

looks good to me

kparal added a comment.May 6 2014, 2:37 PM

I don't see any obvious problem with this patch. Should this fix T148 as well?

libtaskotron/runner.py
179

What does this mean?

kparal added a comment.May 6 2014, 2:40 PM

Hmm, now I understand it a bit better I think. It does not fix T148, it just circumvents the problem by using csv-style for arch list. Is that right?

Shouldn't we use T148 to track yaml list parsing problems, then? And link the ticket in the comment at runner.py:179 ?

tflink added a comment.May 6 2014, 2:55 PM

Hmm, now I understand it a bit better I think. It does not fix T148, it just circumvents the problem by using csv-style for arch list. Is that right?

Yeah, it's just a workaround for T148.

Shouldn't we use T148 to track yaml list parsing problems, then? And link the ticket in the comment at runner.py:179 ?

I'm not against using a tracker ticket for yaml issues but I'd rather have each issue in a separate ticket. However, adding a reference to T148 to the comment at runner.py:179 sounds like a good idea to me.

tflink updated this revision.May 6 2014, 2:58 PM
  • fixing bug found with use of 'target_dir' arg
  • adding note about issue that is worked around with using csv instead of lists
kparal accepted this revision.May 6 2014, 3:03 PM
tflink closed this revision.May 6 2014, 3:12 PM

Closed by commit rLTRN052595dc7c0f (authored by @tflink).

Revision Contents

Diff 232

View Options

libtaskotron/directives/bodhi_directive.py

Show First 20 Lines • Show All 75 Lines • ▼ Show 20 Line(s)75 raise TaskotronDirectiveError("The bodhi directive 'download'"
76 " requires both 'bodhi_id' and" 76​ " requires both 'bodhi_id' and"
77 " 'arch' arguments. Detected arguments: %s" % detected_args) 77​ " 'arch' arguments. Detected arguments: %s" % detected_args)
78 78​
79 workdir = env_data['workdir'] 79​ workdir = env_data['workdir']
80 update = input_data['bodhi_id'] 80​ update = input_data['bodhi_id']
81 if input_data['arch'] == 'all': 81​ if input_data['arch'] == 'all':
82 arches = ['i386', 'x86_64', 'noarch', 'armhfp'] 82​ arches = ['i386', 'x86_64', 'noarch', 'armhfp']
83 else: 83​ else:
84 arches = [input_data['arch']] 84​ arches = [arch.strip() for arch in input_data['arch'].split(',')]
85 if 'noarch' not in arches and arches != ['src']: 85​ if 'noarch' not in arches and arches != ['src']:
86 arches.append('noarch') 86​ arches.append('noarch')
87 87​
88 log.info("getting rpms for update %s (%s) and downloading to %s", 88​ log.info("getting rpms for update %s (%s) and downloading to %s",
89 update, arches, workdir) 89​ update, arches, workdir)
90 90​
91 output_data['downloaded_rpms'] = self.action_download(update, arches, workdir) 91​ output_data['downloaded_rpms'] = self.action_download(update, arches, workdir)
92 92​
93 return output_data 93​ return output_data
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: command=[download] <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 envr specified as "envr"
18 format: 18​ format:
19 "koji: command=download envr=<envr to download> arch=<desired arch> 19​ "koji: command=download envr=<envr to download> arch=<desired arch>
20 download_tag 20​ download_tag
Show All 15 Lines33 def process(self, input_data, env_data):
36 output_data = {} 36​ output_data = {}
37 37​
38 action = input_data['action'] 38​ action = input_data['action']
39 39​
40 if not action in valid_actions: 40​ if not action in valid_actions:
41 raise TaskotronDirectiveError('%s is not a valid command for koji ' 41​ raise TaskotronDirectiveError('%s is not a valid command for koji '
42 'helper' % action) 42​ 'helper' % action)
43 43​
44​ if 'arch' not in input_data:
45​ detected_args = ', '.join(input_data.keys())
46​ raise TaskotronDirectiveError(
47​ "The koji directive requires 'arch' as an argument. Detected"
48​ "arguments: %s" % detected_args)
49​
50​ if not 'target_dir' in input_data:
51​ self.target_dir = env_data['workdir']
52​ else:
53​ self.target_dir = input_data['target_dir']
54​
55​ self.arches = [arch.strip() for arch in input_data['arch'].split(',')]
56​
44 if action == 'download': 57​ if action == 'download':
45 if 'envr' not in input_data or 'arch' not in input_data: 58​ if 'envr' not in input_data:
46 detected_args = ', '.join(input_data.keys()) 59​ detected_args = ', '.join(input_data.keys())
47 raise TaskotronDirectiveError( 60​ raise TaskotronDirectiveError(
48 "The koji directive requires both 'envr' and 'arch'" 61​ "The koji directive requires 'envr' for the 'download'"
49 "arguments. Detected arguments: %s" % detected_args) 62​ "action. Detected arguments: %s" % detected_args)
50 63​
51 tmpdir = env_data['workdir'] ​
52 envr = input_data['envr'] 64​ envr = input_data['envr']
53 arches = [input_data['arch']] ​
54 65​
55 log.info("getting koji builds for %s (%s) and downloading to %s", 66​ log.info("getting koji builds for %s (%s) and downloading to %s",
56 envr, arches, tmpdir) 67​ envr, str(self.arches), self.target_dir)
57 output_data['downloaded_rpms'] = self.koji.get_nvr_rpms(envr, 68​ output_data['downloaded_rpms'] = self.koji.get_nvr_rpms(envr,
58 tmpdir, arches) 69​ self.target_dir,
70​ self.arches)
59 elif action == 'download_tag': 71​ elif action == 'download_tag':
60 if 'tag' not in input_data or 'arch' not in input_data: 72​ if 'tag' not in input_data:
61 detected_args = ', '.join(input_data.keys()) 73​ detected_args = ', '.join(input_data.keys())
62 raise TaskotronDirectiveError( 74​ raise TaskotronDirectiveError(
63 "The koji directive requires both 'tag' and 'arch' " 75​ "The koji directive requires 'tag' for the 'download_tag'"
64 "arguments. Detected arguments: %s" % detected_args) 76​ "action. Detected arguments: %s" % detected_args)
65 77​
66 tmpdir = env_data['workdir'] ​
67 tag = input_data['tag'] 78​ tag = input_data['tag']
68 arches = [input_data['arch']] ​
69 79​
70 log.info("getting koji builds for tag %s and downloading to %s", 80​ log.info("getting koji builds for tag %s, arches %s and downloading"
71 tag, tmpdir) 81​ "to %s", tag, str(self.arches), self.target_dir)
82​
72 output_data['downloaded_rpms'] = self.koji.get_tagged_rpms(tag, 83​ output_data['downloaded_rpms'] = self.koji.get_tagged_rpms(tag,
73 tmpdir, arches) 84​ self.target_dir,
85​ self.arches)
74 86​
75 return output_data 87​ return output_data
View Options

libtaskotron/runner.py

Show First 20 Lines • Show All 130 Lines • ▼ Show 20 Line(s)130 raise NotImplementedError("Environment validation is not"
131 " yet implemented") 131​ " yet implemented")
132 132​
133 133​
134def get_argparser(): 134​def get_argparser():
135 parser = argparse.ArgumentParser() 135​ parser = argparse.ArgumentParser()
136 parser.add_argument("task", nargs=1, help="task to run") 136​ parser.add_argument("task", nargs=1, help="task to run")
137 parser.add_argument("-a", "--arch", 137​ parser.add_argument("-a", "--arch",
138 choices=["i386", "x86_64", "armhfp", "noarch", "all"], 138​ choices=["i386", "x86_64", "armhfp", "noarch", "all"],
139​ action='append',
139 help=""" 140​ help="""
140 Architecture to be used; support arches are x86, x86_64, and armhfp. 141​ Architecture to be used; support arches are x86, x86_64, and armhfp.
141 If omitted, defaults to noarch. If every architechtures are wanted 142​ If omitted, defaults to noarch. If every architechtures are wanted
142 use all. 143​ use all.
143 """) 144​ """)
144 parser.add_argument("-i", "--item", help="item to be used as input") 145​ parser.add_argument("-i", "--item", help="item to be used as input")
145 parser.add_argument("-t", "--type", 146​ parser.add_argument("-t", "--type",
146 choices=["bodhi_id", "koji_build", "koji_tag"], 147​ choices=["bodhi_id", "koji_build", "koji_tag"],
Show All 23 Lines170def main():
170 parser = get_argparser() 171​ parser = get_argparser()
171 args = parser.parse_args() 172​ args = parser.parse_args()
172 173​
173 logger.init(level=logging.DEBUG) 174​ logger.init(level=logging.DEBUG)
174 175​
175 arg_data = process_args(vars(args)) 176​ arg_data = process_args(vars(args))
176 arg_data['taskfile'] = args.task[0] 177​ arg_data['taskfile'] = args.task[0]
177 178​
179​ # since lists don't play nice with yaml, convert arch to csv
kparalUnsubmitted
Not Done

What does this mean?

180​ # this is a workaround for https://phab.qadevel.cloud.fedoraproject.org/T148
181​ arg_data['arch'] = ','.join(arg_data['arch'])
182​
178 task_data = taskyaml.parse_yaml_from_file(arg_data['taskfile']) 183​ task_data = taskyaml.parse_yaml_from_file(arg_data['taskfile'])
179 184​
180 if not task_data: 185​ if not task_data:
181 raise TaskotronYamlError('Input file should not be empty') 186​ raise TaskotronYamlError('Input file should not be empty')
182 187​
183 task_runner = Runner(task_data, arg_data) 188​ task_runner = Runner(task_data, arg_data)
184 task_runner.run() 189​ task_runner.run()
185 190​
186 for output in task_runner.working_data: 191​ for output in task_runner.working_data:
187 if python_utils.listlike(task_runner.working_data[output]): 192​ if python_utils.listlike(task_runner.working_data[output]):
188 log.info("\n" + "\n".join(task_runner.working_data[output])) 193​ log.info("\n" + "\n".join(task_runner.working_data[output]))
189 else: 194​ else:
190 log.info("\n" + task_runner.working_data[output]) 195​ log.info("\n" + task_runner.working_data[output])
View Options

testing/test_bodhi_directive.py

1# -*- coding: utf-8 -*- 1​# -*- coding: utf-8 -*-
2# Copyright 2014, Red Hat, Inc. 2​# Copyright 2014, Red Hat, Inc.
3# License: GNU General Public License version 2 or later 3​# License: GNU General Public License version 2 or later
4 4​
5'''Unit tests for libtaskotron/directives/bodhi_directive.py''' 5​'''Unit tests for libtaskotron/directives/bodhi_directive.py'''
6 6​
7import pytest 7​import pytest
8from dingus import Dingus 8​from dingus import Dingus
9 9​
10from libtaskotron.directives import bodhi_directive 10​from libtaskotron.directives import bodhi_directive
11from libtaskotron.exceptions import TaskotronDirectiveError 11​from libtaskotron.exceptions import TaskotronDirectiveError
12 12​
13class TestBodhiDownloads(): 13​class TestBodhiDownloads():
14 14​
15 def setup_method(self, method): 15​ def setup_method(self, method):
16 '''Run this before every test invocation''' 16​ '''Run this before every test invocation'''
17 self.ref_arch = 'x86_64' 17​ self.ref_arch = ['x86_64']
18 self.ref_bodhi_id = 'FEDORA-1234-56789' 18​ self.ref_bodhi_id = 'FEDORA-1234-56789'
19 self.ref_workdir = '/var/tmp/foo' 19​ self.ref_workdir = '/var/tmp/foo'
20 self.ref_taskfile = '/foo/bar/task.yml' 20​ self.ref_taskfile = '/foo/bar/task.yml'
21 self.ref_nvr1 = 'foo-1.2.3.fc99' 21​ self.ref_nvr1 = 'foo-1.2.3.fc99'
22 self.ref_nvr2 = 'bar-1.2.3.fc99' 22​ self.ref_nvr2 = 'bar-1.2.3.fc99'
23 self.ref_update = {'title': 'Random update', 23​ self.ref_update = {'title': 'Random update',
24 'builds': [{'nvr': self.ref_nvr1, 'package': {}}, 24​ 'builds': [{'nvr': self.ref_nvr1, 'package': {}},
25 {'nvr': self.ref_nvr2, 'package': {}} 25​ {'nvr': self.ref_nvr2, 'package': {}}
26 ], 26​ ],
27 'other_keys': {} 27​ 'other_keys': {}
28 } 28​ }
29 self.ref_input = {'action': 'download', 29​ self.ref_input = {'action': 'download',
30 'arch': self.ref_arch, 30​ 'arch': ', '.join(self.ref_arch),
31 'bodhi_id': self.ref_bodhi_id 31​ 'bodhi_id': self.ref_bodhi_id
32 } 32​ }
33 self.ref_envdata = {'workdir': self.ref_workdir} 33​ self.ref_envdata = {'workdir': self.ref_workdir}
34 self.ref_rpmfile = '%s/%s.rpm' % (self.ref_workdir, self.ref_nvr1) 34​ self.ref_rpmfile = '%s/%s.rpm' % (self.ref_workdir, self.ref_nvr1)
35 35​
36 self.helper = bodhi_directive.BodhiDirective() 36​ self.helper = bodhi_directive.BodhiDirective()
37 37​
38 38​
Show All 15 Lines39 def test_action_download_existing_update(self):
54 # with correct nvrs 54​ # with correct nvrs
55 assert len(getrpms_calls) == 2 55​ assert len(getrpms_calls) == 2
56 assert requested_nvrs == [self.ref_nvr1, self.ref_nvr2] 56​ assert requested_nvrs == [self.ref_nvr1, self.ref_nvr2]
57 assert output_data == ref_output_data 57​ assert output_data == ref_output_data
58 58​
59 59​
60 def test_action_download_all_archs(self): 60​ def test_action_download_all_archs(self):
61 '''Test download when all arches are demanded''' 61​ '''Test download when all arches are demanded'''
62 self.ref_input['arch'] = 'all' 62​ self.ref_arch = ['all']
63​ self.ref_input = {'action': 'download',
64​ 'arch': ', '.join(self.ref_arch),
65​ 'bodhi_id': self.ref_bodhi_id
66​ }
63 67​
64 stub_bodhi = Dingus(query_update__returns = self.ref_update) 68​ stub_bodhi = Dingus(query_update__returns = self.ref_update)
65 stub_koji = Dingus(get_nvr_rpms__returns = [self.ref_rpmfile]) 69​ stub_koji = Dingus(get_nvr_rpms__returns = [self.ref_rpmfile])
66 70​
67 test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji) 71​ test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji)
68 72​
69 test_bodhi.process(self.ref_input, self.ref_envdata) 73​ test_bodhi.process(self.ref_input, self.ref_envdata)
70 74​
71 ref_arches = set(['i386', 'x86_64', 'noarch', 'armhfp']) 75​ ref_arches = set(['i386', 'x86_64', 'noarch', 'armhfp'])
72 getrpms_calls = stub_koji.calls() 76​ getrpms_calls = stub_koji.calls()
73 req_arches = map(lambda x: x[1][2], getrpms_calls) 77​ req_arches = map(lambda x: x[1][2], getrpms_calls)
74 78​
75 # checks whether all get_nvr_rpms calls demanded all arches 79​ # checks whether all get_nvr_rpms calls demanded all arches
76 assert True == all(map(lambda x: set(x) == ref_arches, req_arches)) 80​ assert True == all(map(lambda x: set(x) == ref_arches, req_arches))
77 81​
78 def test_action_download_source(self): 82​ def test_action_download_source(self):
79 '''Test download of source packages''' 83​ '''Test download of source packages'''
80 self.ref_input['arch'] = 'src' 84​ self.ref_arch = ['src']
85​ self.ref_input = {'action': 'download',
86​ 'arch': ', '.join(self.ref_arch),
87​ 'bodhi_id': self.ref_bodhi_id
88​ }
81 89​
82 stub_bodhi = Dingus(query_update__returns = self.ref_update) 90​ stub_bodhi = Dingus(query_update__returns = self.ref_update)
83 stub_koji = Dingus(get_nvr_rpms__returns = [self.ref_rpmfile]) 91​ stub_koji = Dingus(get_nvr_rpms__returns = [self.ref_rpmfile])
84 92​
85 test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji) 93​ test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji)
86 94​
87 test_bodhi.process(self.ref_input, self.ref_envdata) 95​ test_bodhi.process(self.ref_input, self.ref_envdata)
88 96​
89 getrpms_calls = stub_koji.calls() 97​ getrpms_calls = stub_koji.calls()
90 req_arches = map(lambda x: x[1][2], getrpms_calls) 98​ req_arches = map(lambda x: x[1][2], getrpms_calls)
91 99​
92 # checks whether all get_nvr_rpms calls demanded only source pkgs 100​ # checks whether all get_nvr_rpms calls demanded only source pkgs
93 assert all(map(lambda x: x == ['src'], req_arches)) 101​ assert all(map(lambda x: x == ['src'], req_arches))
94 102​
103​ def test_action_download_multiple_arch(self):
104​ '''Test download of multiple arches packages'''
105​ self.ref_arch = ['x86_64', 'noarch']
106​ self.ref_input = {'action': 'download',
107​ 'arch': ', '.join(self.ref_arch),
108​ 'bodhi_id': self.ref_bodhi_id
109​ }
110​
111​ stub_bodhi = Dingus(query_update__returns = self.ref_update)
112​ stub_koji = Dingus(get_nvr_rpms__returns = [self.ref_rpmfile])
113​
114​ test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji)
115​
116​ test_bodhi.process(self.ref_input, self.ref_envdata)
117​
118​ getrpms_calls = stub_koji.calls()
119​ req_arches = map(lambda x: x[1][2], getrpms_calls)
120​
121​ # checks whether all get_nvr_rpms calls demanded only source pkgs
122​ assert all(map(lambda x: x == ['x86_64', 'noarch'], req_arches))
123​
95 def test_action_download_added_noarch(self): 124​ def test_action_download_added_noarch(self):
96 '''Test whether noarch is automaticaly added''' 125​ '''Test whether noarch is automaticaly added'''
97 self.ref_input['arch'] = 'i386' 126​ self.ref_arch = ['i386']
127​ self.ref_input = {'action': 'download',
128​ 'arch': ', '.join(self.ref_arch),
129​ 'bodhi_id': self.ref_bodhi_id
130​ }
98 131​
99 stub_bodhi = Dingus(query_update__returns = self.ref_update) 132​ stub_bodhi = Dingus(query_update__returns = self.ref_update)
100 stub_koji = Dingus(get_nvr_rpms__returns = [self.ref_rpmfile]) 133​ stub_koji = Dingus(get_nvr_rpms__returns = [self.ref_rpmfile])
101 134​
102 test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji) 135​ test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji)
103 136​
104 test_bodhi.process(self.ref_input, self.ref_envdata) 137​ test_bodhi.process(self.ref_input, self.ref_envdata)
105 138​
▲ Show 20 Lines • Show All 59 Lines • Show Last 20 Lines
View Options

testing/test_koji_directive.py

1from dingus import Dingus 1​from dingus import Dingus
2 2​
3from libtaskotron.directives import koji_directive 3​from libtaskotron.directives import koji_directive
4 4​
5class TestKojiDirective(): 5​class TestKojiDirective():
6 def setup_method(self, method): 6​ def setup_method(self, method):
7 self.ref_nvr = 'foo-1.2-3.fc99' 7​ self.ref_nvr = 'foo-1.2-3.fc99'
8 self.ref_arch = 'noarch' 8​ self.ref_arch = ['noarch']
9 self.ref_tag = 'tagfoo' 9​ self.ref_tag = 'tagfoo'
10 self.ref_name = 'foo' 10​ self.ref_name = 'foo'
11 self.ref_version = '1.2' 11​ self.ref_version = '1.2'
12 self.ref_release = '3.fc99' 12​ self.ref_release = '3.fc99'
13 self.ref_buildid = 123456 13​ self.ref_buildid = 123456
14 14​
15 self.ref_build = {'package_name': self.ref_name, 15​ self.ref_build = {'package_name': self.ref_name,
16 'version': self.ref_version, 16​ 'version': self.ref_version,
17 'release': self.ref_release, 17​ 'release': self.ref_release,
18 'id': self.ref_buildid} 18​ 'id': self.ref_buildid}
19 19​
20 self.ref_rpms = [{'name': self.ref_name, 'version': self.ref_version, 20​ self.ref_rpms = [{'name': self.ref_name, 'version': self.ref_version,
21 'release': self.ref_release, 'nvr': self.ref_nvr, 21​ 'release': self.ref_release, 'nvr': self.ref_nvr,
22 'arch': self.ref_arch}, 22​ 'arch': self.ref_arch},
23 {'name': self.ref_name, 'version': self.ref_version, 23​ {'name': self.ref_name, 'version': self.ref_version,
24 'release': self.ref_release, 'nvr': self.ref_nvr, 24​ 'release': self.ref_release, 'nvr': self.ref_nvr,
25 'arch': 'src'}] 25​ 'arch': 'src'}]
26 26​
27 self.ref_tagged = [{'nvr': self.ref_nvr}] 27​ self.ref_tagged = [{'nvr': self.ref_nvr}]
28 28​
29 self.ref_url = 'http://downloads.example.com/builds/%s.noarch.rpm'\ 29​ self.ref_url = 'http://downloads.example.com/builds/%s.noarch.rpm'\
30 % self.ref_nvr 30​ % self.ref_nvr
31 self.helper = koji_directive.KojiDirective() 31​ self.helper = koji_directive.KojiDirective()
32 32​
33 def test_parse_download_command(self): 33​ self.ref_envdata = {'workdir': '/var/tmp/foo'}
34​
34 self.ref_rpms = ['/var/tmp/fake/%s.%s.rpm' 35​ self.ref_rpms = ['/var/tmp/fake/%s.%s.rpm'
35 % (self.ref_nvr, self.ref_arch)] 36​ % (self.ref_nvr, self.ref_arch)]
36 37​
37 ref_input = {'action': 'download', 'arch': self.ref_arch, 38​ def test_parse_download_command(self):
38 'envr': self.ref_nvr} 39​
39 ref_envdata = {'workdir': '/var/tmp/foo'} 40​ self.ref_input = {'action': 'download',
41​ 'arch': ', '.join(self.ref_arch),
42​ 'envr': self.ref_nvr}
40 43​
41 stub_koji = Dingus(get_nvr_rpms__returns = self.ref_rpms) 44​ stub_koji = Dingus(get_nvr_rpms__returns = self.ref_rpms)
42 45​
43 test_helper = koji_directive.KojiDirective(stub_koji) 46​ test_helper = koji_directive.KojiDirective(stub_koji)
44 47​
45 test_helper.process(ref_input, ref_envdata) 48​ test_helper.process(self.ref_input, self.ref_envdata)
46 49​
47 getrpm_calls = stub_koji.calls() 50​ getrpm_calls = stub_koji.calls()
48 requested_nvr = getrpm_calls[0][1][0] 51​ requested_nvr = getrpm_calls[0][1][0]
49 52​
50 assert len(getrpm_calls) == 1 53​ assert len(getrpm_calls) == 1
51 assert requested_nvr == self.ref_nvr 54​ assert requested_nvr == self.ref_nvr
52 55​
53 def test_parse_download_tag_command(self): 56​ def test_parse_download_tag_command(self):
54 self.ref_rpms = ['/var/tmp/fake/%s.%s.rpm' ​
55 % (self.ref_nvr, self.ref_arch)] ​
56 57​
57 ref_input = {'action': 'download_tag', 'arch': self.ref_arch, 58​ self.ref_input = {'action': 'download_tag',
58 'tag': self.ref_tag} 59​ 'arch': ', '.join(self.ref_arch),
59 ref_envdata = {'workdir': '/var/tmp/foo'} 60​ 'tag': self.ref_tag}
60 61​
61 stub_koji = Dingus(get_tagged_rpms__returns=self.ref_rpms) 62​ stub_koji = Dingus(get_tagged_rpms__returns=self.ref_rpms)
62 63​
63 test_helper = koji_directive.KojiDirective(stub_koji) 64​ test_helper = koji_directive.KojiDirective(stub_koji)
64 65​
65 test_helper.process(ref_input, ref_envdata) 66​ test_helper.process(self.ref_input, self.ref_envdata)
66 67​
67 getrpm_calls = stub_koji.calls() 68​ getrpm_calls = stub_koji.calls()
68 requested_tag = getrpm_calls[0][1][0] 69​ requested_tag = getrpm_calls[0][1][0]
69 70​
70 assert len(getrpm_calls) == 1 71​ assert len(getrpm_calls) == 1
71 assert requested_tag == self.ref_tag 72​ assert requested_tag == self.ref_tag
73​
74​ def test_parse_multiple_arches(self):
75​ self.ref_arch = ['noarch', 'i386']
76​
77​ self.ref_input = {'action': 'download_tag',
78​ 'arch': ', '.join(self.ref_arch),
79​ 'tag': self.ref_tag}
80​
81​ stub_koji = Dingus('koji_utils')
82​
83​ test_helper = koji_directive.KojiDirective(stub_koji)
84​ test_helper.process(self.ref_input, self.ref_envdata)
85​
86​ assert test_helper.arches == self.ref_arch
87​
88​ def test_parse_single_arch(self):
89​ self.ref_input = {'action': 'download_tag',
90​ 'arch': ', '.join(self.ref_arch),
91​ 'tag': self.ref_tag}
92​
93​ stub_koji = Dingus('koji_utils')
94​
95​ test_helper = koji_directive.KojiDirective(stub_koji)
96​ test_helper.process(self.ref_input, self.ref_envdata)
97​
98​ assert test_helper.arches == self.ref_arch
View Options

testing/test_runner.py

Show First 20 Lines • Show All 320 Lines • ▼ Show 20 Line(s)315 def test_process_args_koji_build(self):
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 323​
324 test_args = runner.process_args(ref_input) 324​ test_args = runner.process_args(ref_input)
325 325​
326 assert test_args == ref_args 326​ assert test_args == ref_args
327 327​
328 def test_process_args_bodhi_id(self): 328​ def test_process_args_bodhi_id(self):
329 ref_input = { 'arch': 'x86_64', 329​ ref_input = { 'arch': ['x86_64'],
330 'item': 'foo-1.2-3.fc99', 330​ 'item': 'foo-1.2-3.fc99',
331 'type': 'bodhi_id', 331​ 'type': 'bodhi_id',
332 'task': 'sometask.yml'} 332​ 'task': 'sometask.yml'}
333 333​
334 ref_args = copy.deepcopy(ref_input) 334​ ref_args = copy.deepcopy(ref_input)
335 ref_args['bodhi_id'] = 'foo-1.2-3.fc99' 335​ ref_args['bodhi_id'] = 'foo-1.2-3.fc99'
336 336​
337 test_args = runner.process_args(ref_input) 337​ test_args = runner.process_args(ref_input)
338 338​
339 assert test_args == ref_args 339​ assert test_args == ref_args
340 340​
341 def test_process_args_koji_tag(self): 341​ def test_process_args_koji_tag(self):
342 ref_input = { 'arch': 'x86_64', 342​ ref_input = { 'arch': ['x86_64'],
343​ 'item': 'dist-fc99-updates',
344​ 'type': 'koji_tag',
345​ 'task': 'sometask.yml'}
346​
347​ ref_args = copy.deepcopy(ref_input)
348​ ref_args['tag'] = 'dist-fc99-updates'
349​
350​ test_args = runner.process_args(ref_input)
351​
352​ assert test_args == ref_args
353​
354​ def test_process_args_koji_tag_multiple_arches(self):
355​ ref_input = { 'arch': ['x86_64,i386,noarch'],
343 'item': 'dist-fc99-updates', 356​ 'item': 'dist-fc99-updates',
344 'type': 'koji_tag', 357​ 'type': 'koji_tag',
345 'task': 'sometask.yml'} 358​ 'task': 'sometask.yml'}
346 359​
347 ref_args = copy.deepcopy(ref_input) 360​ ref_args = copy.deepcopy(ref_input)
348 ref_args['tag'] = 'dist-fc99-updates' 361​ ref_args['tag'] = 'dist-fc99-updates'
349 362​
350 test_args = runner.process_args(ref_input) 363​ test_args = runner.process_args(ref_input)
351 364​
352 assert test_args == ref_args 365​ assert test_args == ref_args
353No newline at end of file 366​No newline at end of file