Differential D134

remove generic Exception catching in tests
ClosedPublic
Actions

Authored by garretraziel on Jun 11 2014, 12:03 PM.

Details

Reviewers
kparal
tflink
Maniphest Tasks
T212: don't catch Exceptions in Runner's unit tests
Commits
rLTRNa40f10aebac2: remove generic Exception catching in tests
Summary

Change all .raises(Exception) and except Exception to
catch appropriate exceptions from libtaskotron.exceptions.

Test Plan

py.test -F testing run as usual

Diff Detail

Repository
rLTRN libtaskotron
Lint
Lint Skipped
Unit
Unit Tests Skipped
garretraziel retitled this revision from to remove generic Exception catching in tests.Jun 11 2014, 12:03 PM
garretraziel updated this object.
garretraziel edited the test plan for this revision. (Show Details)
garretraziel added reviewers: tflink, kparal.
garretraziel added inline comments.Jun 11 2014, 12:09 PM
testing/test_runner.py
117–118

I went trough changes in git and decided that there isn't currently code with the same functionality that should be tested. do_prep() was removed in D5 (and, ironically, this test was introduced in D5).

kparal accepted this revision.Jun 11 2014, 12:24 PM

Thanks! Before pushing, please confirm with @tflink that the do_prep() test is really not needed anymore.

This revision is now accepted and ready to land.Jun 11 2014, 12:24 PM
tflink accepted this revision.Jun 17 2014, 11:16 AM

Sorry for the delay, didn't realize this was waiting on me.

do_prep() is a leftover artifact from the initial taskbot code, it can be removed

garretraziel closed this revision.Jun 18 2014, 11:39 AM
garretraziel updated this revision to Diff 422.

Closed by commit rLTRNa40f10aebac2 (authored by Garret Raziel <boloomka@gmail.com>).

Revision Contents

Diff 422

View Options

testing/test_koji_utils.py

Show First 20 Lines • Show All 57 Lines • ▼ Show 20 Line(s)54 def should_i386_rpmurls_query_i686(self):
58 58​
59 test_koji = koji_utils.KojiClient(stub_koji) 59​ test_koji = koji_utils.KojiClient(stub_koji)
60 60​
61 # this isn't setup to actually return urls since we don't care about 61​ # this isn't setup to actually return urls since we don't care about
62 # that for this test 62​ # that for this test
63 # it should throw an exception in this case. 63​ # it should throw an exception in this case.
64 try: 64​ try:
65 test_koji.nvr_to_urls(self.ref_nvr, arches = [self.ref_arch]) 65​ test_koji.nvr_to_urls(self.ref_nvr, arches = [self.ref_arch])
66 except Exception: 66​ except exc.TaskotronRemoteError:
67 pass 67​ pass
68 68​
69 listrpm_calls = stub_koji.calls('listRPMs') 69​ listrpm_calls = stub_koji.calls('listRPMs')
70 requested_arches = listrpm_calls[0][2]['arches'] 70​ requested_arches = listrpm_calls[0][2]['arches']
71 71​
72 assert 'i686' in requested_arches 72​ assert 'i686' in requested_arches
73 assert 'i386' in requested_arches 73​ assert 'i386' in requested_arches
74 74​
75 def should_throw_exception_norpms(self): 75​ def should_throw_exception_norpms(self):
76 stub_koji = Dingus(getBuild__returns = self.ref_build) 76​ stub_koji = Dingus(getBuild__returns = self.ref_build)
77 77​
78 test_koji = koji_utils.KojiClient(stub_koji) 78​ test_koji = koji_utils.KojiClient(stub_koji)
79 79​
80 with pytest.raises(Exception): 80​ with pytest.raises(exc.TaskotronRemoteError):
81 test_koji.nvr_to_urls(self.ref_nvr, arches = [self.ref_arch]) 81​ test_koji.nvr_to_urls(self.ref_nvr, arches = [self.ref_arch])
82 82​
83 83​
84class TestGetENVR(object): 84​class TestGetENVR(object):
85 85​
86 def test_epoch(self): 86​ def test_epoch(self):
87 '''Epoch included in build''' 87​ '''Epoch included in build'''
88 build = {'nvr': 'foo-1.2-3.fc20', 88​ build = {'nvr': 'foo-1.2-3.fc20',
Show All 15 Lines
View Options

testing/test_python_directive.py

Show All 25 Lines15class TestCheckfile(object):
26 def test_not_existing_file(self, monkeypatch): 26​ def test_not_existing_file(self, monkeypatch):
27 ref_filename = 'turbo_encabulator.py' 27​ ref_filename = 'turbo_encabulator.py'
28 28​
29 stub_ospath = Dingus(exists__returns=False) 29​ stub_ospath = Dingus(exists__returns=False)
30 30​
31 test_directive = python_directive.PythonDirective() 31​ test_directive = python_directive.PythonDirective()
32 monkeypatch.setattr(os, 'path', stub_ospath) 32​ monkeypatch.setattr(os, 'path', stub_ospath)
33 33​
34 with pytest.raises(Exception): 34​ with pytest.raises(TaskotronDirectiveError):
35 test_directive.checkfile(ref_filename) 35​ test_directive.checkfile(ref_filename)
36 36​
37 37​
38class TestLoadPyfile(object): 38​class TestLoadPyfile(object):
39 def test_task_importname(self, monkeypatch): 39​ def test_task_importname(self, monkeypatch):
40 ref_filename = '/real/magic/turbo_encabulator.py' 40​ ref_filename = '/real/magic/turbo_encabulator.py'
41 ref_taskname = 'runtask_turbo_encabulator' 41​ ref_taskname = 'runtask_turbo_encabulator'
42 stub_imp = Dingus() 42​ stub_imp = Dingus()
▲ Show 20 Lines • Show All 188 Lines • Show Last 20 Lines
View Options

testing/test_runner.py

1# -*- coding: utf-8 -*- 1​# -*- coding: utf-8 -*-
2# Copyright 2009-2014, Red Hat, Inc. 2​# Copyright 2009-2014, Red Hat, Inc.
3# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+> 3​# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+>
4# See the LICENSE file for more details on Licensing 4​# See the LICENSE file for more details on Licensing
5 5​
6import pytest 6​import pytest
7import os 7​import os
8import sys 8​import sys
9import copy 9​import copy
10 10​
11from libtaskotron import runner 11​from libtaskotron import runner
12from libtaskotron.exceptions import TaskotronYamlError 12​from libtaskotron import exceptions as exc
13 13​
14 14​
15class TestRunnerInputVerify(): 15​class TestRunnerInputVerify():
16 def test_yamlrunner_valid_input(self): 16​ def test_yamlrunner_valid_input(self):
17 ref_cmd = '-i foo-1.2-3.fc99 -t koji_build -a x86_64 footask.yml' 17​ ref_cmd = '-i foo-1.2-3.fc99 -t koji_build -a x86_64 footask.yml'
18 ref_argdata = {'input': {'args': ['koji_build', 'arch']}} 18​ ref_argdata = {'input': {'args': ['koji_build', 'arch']}}
19 19​
20 test_parser = runner.get_argparser() 20​ test_parser = runner.get_argparser()
Show All 21 Lines40 def test_yamlrunner_fails_empty_input(self):
42 ref_inputspec = {'input': None} 42​ ref_inputspec = {'input': None}
43 43​
44 test_parser = runner.get_argparser() 44​ test_parser = runner.get_argparser()
45 test_input_args = vars(test_parser.parse_args(ref_cmd.split())) 45​ test_input_args = vars(test_parser.parse_args(ref_cmd.split()))
46 test_args = runner.process_args(test_input_args) 46​ test_args = runner.process_args(test_input_args)
47 47​
48 test_runner = runner.Runner(ref_inputspec, test_args) 48​ test_runner = runner.Runner(ref_inputspec, test_args)
49 49​
50 with pytest.raises(TaskotronYamlError): 50​ with pytest.raises(exc.TaskotronYamlError):
51 test_runner._validate_input() 51​ test_runner._validate_input()
52 52​
53 def test_yamlrunner_fails_empty_arg(self): 53​ def test_yamlrunner_fails_empty_arg(self):
54 ref_cmd = '-i foo-1.2-3.fc99 -t koji_build footask.yml' 54​ ref_cmd = '-i foo-1.2-3.fc99 -t koji_build footask.yml'
55 ref_inputspec = {'input': {'args': None}} 55​ ref_inputspec = {'input': {'args': None}}
56 56​
57 test_parser = runner.get_argparser() 57​ test_parser = runner.get_argparser()
58 test_input_args = vars(test_parser.parse_args(ref_cmd.split())) 58​ test_input_args = vars(test_parser.parse_args(ref_cmd.split()))
59 test_args = runner.process_args(test_input_args) 59​ test_args = runner.process_args(test_input_args)
60 60​
61 test_runner = runner.Runner(ref_inputspec, test_args) 61​ test_runner = runner.Runner(ref_inputspec, test_args)
62 62​
63 with pytest.raises(TaskotronYamlError): 63​ with pytest.raises(exc.TaskotronYamlError):
64 test_runner._validate_input() 64​ test_runner._validate_input()
65 65​
66 def test_yamlrunner_fails_missing_arg(self): 66​ def test_yamlrunner_fails_missing_arg(self):
67 ref_cmd = '-i foo-1.2-3.fc99 -t koji_build footask.yml' 67​ ref_cmd = '-i foo-1.2-3.fc99 -t koji_build footask.yml'
68 ref_inputspec = {'input': 'other_item'} 68​ ref_inputspec = {'input': 'other_item'}
69 69​
70 test_parser = runner.get_argparser() 70​ test_parser = runner.get_argparser()
71 test_input_args = vars(test_parser.parse_args(ref_cmd.split())) 71​ test_input_args = vars(test_parser.parse_args(ref_cmd.split()))
72 test_args = runner.process_args(test_input_args) 72​ test_args = runner.process_args(test_input_args)
73 73​
74 test_runner = runner.Runner(ref_inputspec, test_args) 74​ test_runner = runner.Runner(ref_inputspec, test_args)
75 75​
76 with pytest.raises(TaskotronYamlError): 76​ with pytest.raises(exc.TaskotronYamlError):
77 test_runner._validate_input() 77​ test_runner._validate_input()
78 78​
79 def test_yamlrunner_fails_undefined_arg(self): 79​ def test_yamlrunner_fails_undefined_arg(self):
80 ref_cmd = '-i foo-1.2-3.fc99 -t koji_build footask.yml' 80​ ref_cmd = '-i foo-1.2-3.fc99 -t koji_build footask.yml'
81 ref_inputspec = {'input': {'args': 'nonexistent_input_arg'}} 81​ ref_inputspec = {'input': {'args': 'nonexistent_input_arg'}}
82 82​
83 test_parser = runner.get_argparser() 83​ test_parser = runner.get_argparser()
84 test_input_args = vars(test_parser.parse_args(ref_cmd.split())) 84​ test_input_args = vars(test_parser.parse_args(ref_cmd.split()))
85 test_args = runner.process_args(test_input_args) 85​ test_args = runner.process_args(test_input_args)
86 86​
87 test_runner = runner.Runner(ref_inputspec, test_args) 87​ test_runner = runner.Runner(ref_inputspec, test_args)
88 88​
89 with pytest.raises(TaskotronYamlError): 89​ with pytest.raises(exc.TaskotronYamlError):
90 test_runner._validate_input() 90​ test_runner._validate_input()
91 91​
92 def test_yamlrunner_fails_input_is_string(self): 92​ def test_yamlrunner_fails_input_is_string(self):
93 ref_cmd = '-i foo-1.2-3.fc99 -t koji_build footask.yml' 93​ ref_cmd = '-i foo-1.2-3.fc99 -t koji_build footask.yml'
94 ref_inputspec = {'input': {'args'}} 94​ ref_inputspec = {'input': {'args'}}
95 95​
96 test_parser = runner.get_argparser() 96​ test_parser = runner.get_argparser()
97 test_input_args = vars(test_parser.parse_args(ref_cmd.split())) 97​ test_input_args = vars(test_parser.parse_args(ref_cmd.split()))
98 test_args = runner.process_args(test_input_args) 98​ test_args = runner.process_args(test_input_args)
99 99​
100 test_runner = runner.Runner(ref_inputspec, test_args) 100​ test_runner = runner.Runner(ref_inputspec, test_args)
101 101​
102 with pytest.raises(TaskotronYamlError): 102​ with pytest.raises(exc.TaskotronYamlError):
103 test_runner._validate_input() 103​ test_runner._validate_input()
104 104​
105class TestRunnerSetup(): 105​class TestRunnerSetup():
106 def test_trivial_creation(self, tmpdir): 106​ def test_trivial_creation(self, tmpdir):
107 ref_taskdata = {'preparation': {'koji': 'download nvr'}, 107​ ref_taskdata = {'preparation': {'koji': 'download nvr'},
108 'input': {'args': ['koji_build','arch']}, 108​ 'input': {'args': ['koji_build','arch']},
109 'post': {'shell': 'clean'}, 109​ 'post': {'shell': 'clean'},
110 'execution': {'python': 'run_rpmlint.py'}, 110​ 'execution': {'python': 'run_rpmlint.py'},
111 'dependencies': ['rpmlint', 'libtaskbot']} 111​ 'dependencies': ['rpmlint', 'libtaskbot']}
112 ref_inputdata = {} 112​ ref_inputdata = {}
113 113​
114 test_runner = runner.Runner(ref_taskdata, ref_inputdata, tmpdir) 114​ test_runner = runner.Runner(ref_taskdata, ref_inputdata, tmpdir)
115 115​
116 assert test_runner.taskdata == ref_taskdata 116​ assert test_runner.taskdata == ref_taskdata
117 117​
118class TestRunnerPrep(): ​
119 def test_prep_invalid_commands(self, tmpdir): ​
120 ref_taskdata = {'preparation': {'turboencabulator': ​
121 'reduce sinusoidal repleneration'}} ​
122 ref_inputdata = {} ​
123 ​
124 test_runner = runner.Runner(ref_taskdata, ref_inputdata, tmpdir) ​
125 ​
126 with pytest.raises(Exception): ​
127 test_runner.do_prep() ​
128 ​
129class TestRunnerDirectiveLoader(): 118​class TestRunnerDirectiveLoader():
garretrazielAuthorUnsubmitted
Not Done

I went trough changes in git and decided that there isn't currently code with the same functionality that should be tested. do_prep() was removed in D5 (and, ironically, this test was introduced in D5).

130 119​
131 def setup_method(self, method): 120​ def setup_method(self, method):
132 self.ref_dir = os.path.abspath('testing/test_directives/') 121​ self.ref_dir = os.path.abspath('testing/test_directives/')
133 self.ref_taskdata = {} 122​ self.ref_taskdata = {}
134 self.ref_inputdata = {} 123​ self.ref_inputdata = {}
135 self.ref_directivename = 'test' 124​ self.ref_directivename = 'test'
136 125​
137 def test_runner_load_directive(self, tmpdir): 126​ def test_runner_load_directive(self, tmpdir):
Show All 13 Lines134 def test_runner_load_directive_indict(self, tmpdir):
151 assert self.ref_directivename in test_runner.directives.keys() 140​ assert self.ref_directivename in test_runner.directives.keys()
152 141​
153 def test_runner_load_directive_notexist(self, tmpdir): 142​ def test_runner_load_directive_notexist(self, tmpdir):
154 self.ref_directivename = 'noexist' 143​ self.ref_directivename = 'noexist'
155 144​
156 test_runner = runner.Runner(self.ref_taskdata, self.ref_inputdata, 145​ test_runner = runner.Runner(self.ref_taskdata, self.ref_inputdata,
157 tmpdir) 146​ tmpdir)
158 147​
159 with pytest.raises(Exception): 148​ with pytest.raises(exc.TaskotronYamlError):
160 test_runner._load_directive(self.ref_directivename, self.ref_dir) 149​ test_runner._load_directive(self.ref_directivename, self.ref_dir)
161 150​
162class TestRunnerSingleAction(): 151​class TestRunnerSingleAction():
163 152​
164 def setup_method(self, method): 153​ def setup_method(self, method):
165 self.ref_taskdata = {} 154​ self.ref_taskdata = {}
166 self.ref_inputdata = {} 155​ self.ref_inputdata = {}
167 156​
Show All 20 Lines
188 177​
189 178​
190 def test_runner_single_dummy_action_fail(self): 179​ def test_runner_single_dummy_action_fail(self):
191 ref_action = {'name': 'Dummy Action', 180​ ref_action = {'name': 'Dummy Action',
192 'dummy': {'result': 'fail'}} 181​ 'dummy': {'result': 'fail'}}
193 182​
194 test_runner = runner.Runner(self.ref_taskdata, self.ref_inputdata) 183​ test_runner = runner.Runner(self.ref_taskdata, self.ref_inputdata)
195 184​
196 with pytest.raises(Exception): 185​ with pytest.raises(exc.TaskotronDirectiveError):
197 test_runner.do_single_action(ref_action) 186​ test_runner.do_single_action(ref_action)
198 187​
199 def test_runner_do_single_dummy_action_pass_export(self): 188​ def test_runner_do_single_dummy_action_pass_export(self):
200 ref_exportname = 'dummy_output' 189​ ref_exportname = 'dummy_output'
201 ref_output = 'this is example output' 190​ ref_output = 'this is example output'
202 ref_action = {'name': 'Dummy Action', 191​ ref_action = {'name': 'Dummy Action',
203 'dummy': {'result': 'pass', 'msg': ref_output}, 192​ 'dummy': {'result': 'pass', 'msg': ref_output},
204 'export': '%s' % ref_exportname} 193​ 'export': '%s' % ref_exportname}
Show All 39 Lines219class TestRunnerDoActions():
244 233​
245 def test_runner_do_single_dummy_fail(self): 234​ def test_runner_do_single_dummy_fail(self):
246 ref_action = {'name': 'Dummy Action', 235​ ref_action = {'name': 'Dummy Action',
247 'dummy': {'result': 'fail'}} 236​ 'dummy': {'result': 'fail'}}
248 self.ref_taskdata = {'task': [ref_action]} 237​ self.ref_taskdata = {'task': [ref_action]}
249 238​
250 test_runner = runner.Runner(self.ref_taskdata, self.ref_inputdata) 239​ test_runner = runner.Runner(self.ref_taskdata, self.ref_inputdata)
251 240​
252 with pytest.raises(Exception): 241​ with pytest.raises(exc.TaskotronDirectiveError):
253 test_runner.do_actions() 242​ test_runner.do_actions()
254 243​
255 def test_runner_do_multiple_dummy_fail(self): 244​ def test_runner_do_multiple_dummy_fail(self):
256 ref_action = {'name': 'Dummy Action', 245​ ref_action = {'name': 'Dummy Action',
257 'dummy': {'result': 'fail'}} 246​ 'dummy': {'result': 'fail'}}
258 self.ref_taskdata = {'task': [ref_action, ref_action]} 247​ self.ref_taskdata = {'task': [ref_action, ref_action]}
259 248​
260 test_runner = runner.Runner(self.ref_taskdata, self.ref_inputdata) 249​ test_runner = runner.Runner(self.ref_taskdata, self.ref_inputdata)
261 250​
262 with pytest.raises(Exception): 251​ with pytest.raises(exc.TaskotronDirectiveError):
263 test_runner.do_actions() 252​ test_runner.do_actions()
264 253​
265 def test_runner_do_multiple_dummy_pass_export_rendered_msg(self): 254​ def test_runner_do_multiple_dummy_pass_export_rendered_msg(self):
266 ref_exportname = 'dummy_output' 255​ ref_exportname = 'dummy_output'
267 ref_message = 'This is a variable message' 256​ ref_message = 'This is a variable message'
268 ref_messagename = 'variable_messsage' 257​ ref_messagename = 'variable_messsage'
269 ref_action = {'name': 'Dummy Action', 258​ ref_action = {'name': 'Dummy Action',
270 'dummy': {'result': 'pass', 259​ 'dummy': {'result': 'pass',
Show All 9 Lines
280 269​
281 assert test_runner.working_data[ref_exportname] == ref_message 270​ assert test_runner.working_data[ref_exportname] == ref_message
282 271​
283 def test_runner_fails_missing_action(self): 272​ def test_runner_fails_missing_action(self):
284 self.ref_taskdata = {'task': None} 273​ self.ref_taskdata = {'task': None}
285 274​
286 test_runner = runner.Runner(self.ref_taskdata, self.ref_inputdata) 275​ test_runner = runner.Runner(self.ref_taskdata, self.ref_inputdata)
287 276​
288 with pytest.raises(TaskotronYamlError): 277​ with pytest.raises(exc.TaskotronYamlError):
289 test_runner.do_actions() 278​ test_runner.do_actions()
290 279​
291 def test_runner_fails_missing_task(self): 280​ def test_runner_fails_missing_task(self):
292 self.ref_taskdata = {} 281​ self.ref_taskdata = {}
293 282​
294 test_runner = runner.Runner(self.ref_taskdata, self.ref_inputdata) 283​ test_runner = runner.Runner(self.ref_taskdata, self.ref_inputdata)
295 284​
296 with pytest.raises(TaskotronYamlError): 285​ with pytest.raises(exc.TaskotronYamlError):
297 test_runner.do_actions() 286​ test_runner.do_actions()
298 287​
299 288​
300class TestRunnerRenderAction(): 289​class TestRunnerRenderAction():
301 290​
302 def setup_method(self, method): 291​ def setup_method(self, method):
303 self.ref_taskdata = {} 292​ self.ref_taskdata = {}
304 self.ref_inputdata = {} 293​ self.ref_inputdata = {}
▲ Show 20 Lines • Show All 109 Lines • Show Last 20 Lines