Differential D346

testing: rename test_directive to stub_directive
ClosedPublic
Actions

Authored by kparal on Apr 21 2015, 3:00 PM.

Details

Reviewers
tflink
mkrizek
jskladan
Commits
rLTRN8169f23af532: test: rename test_directive to stub_directive
Summary

py.test was picking up the name (and TestDirective class inside) and was
emitting warnings about incorrectly set up test class. Rename it to make
it clear we don't actually want to run it, just use as a stub in a
different test.

Before:

$ py.test -F -r w testing/
================================================================ test session starts =================================================================
platform linux2 -- Python 2.7.8 -- py-1.4.26 -- pytest-2.6.4
plugins: cov
collected 272 items 

testing/functest_config.py .....
testing/functest_file_utils.py ............
testing/functest_koji_utils.py ...
testing/functest_logger.py ...
testing/functest_mash_directive.py .....
testing/functest_python_directive.py ...
testing/functest_runner.py .
testing/functest_yumrepoinfo.py ..
testing/functest_yumrepoinfo_directive.py ............
testing/test_arch_utils.py ....
testing/test_bodhi_comment_directive.py ..............
testing/test_bodhi_directive.py ........
testing/test_bodhi_utils.py ..........
testing/test_buildbot_utils.py ......
testing/test_check.py .............................
testing/test_config.py ...........
testing/test_directive_modules.py ...
testing/test_koji_directive.py .......
testing/test_koji_utils.py ...................
testing/test_logger.py .....
testing/test_python_directive.py .............
testing/test_python_utils.py ......
testing/test_resultsdb_directive.py ...........
testing/test_rpm_utils.py ...........
testing/test_runner.py .................................
testing/test_taskformula.py ......................
testing/test_yumrepoinfo.py ..............

================================================================== warning summary ===================================================================
WC1 /home/kparal/devel/taskotron/libtaskotron/testing/test_directives/test_directive.py cannot collect test class 'TestDirective' because it has a __init__ constructor
======================================================= 272 passed, 1 warnings in 4.78 seconds =======================================================

After:

$ py.test -F -r w testing/
================================================================ test session starts =================================================================
platform linux2 -- Python 2.7.8 -- py-1.4.26 -- pytest-2.6.4
plugins: cov
collected 272 items 

testing/functest_config.py .....
testing/functest_file_utils.py ............
testing/functest_koji_utils.py ...
testing/functest_logger.py ...
testing/functest_mash_directive.py .....
testing/functest_python_directive.py ...
testing/functest_runner.py .
testing/functest_yumrepoinfo.py ..
testing/functest_yumrepoinfo_directive.py ............
testing/test_arch_utils.py ....
testing/test_bodhi_comment_directive.py ..............
testing/test_bodhi_directive.py ........
testing/test_bodhi_utils.py ..........
testing/test_buildbot_utils.py ......
testing/test_check.py .............................
testing/test_config.py ...........
testing/test_directive_modules.py ...
testing/test_koji_directive.py .......
testing/test_koji_utils.py ...................
testing/test_logger.py .....
testing/test_python_directive.py .............
testing/test_python_utils.py ......
testing/test_resultsdb_directive.py ...........
testing/test_rpm_utils.py ...........
testing/test_runner.py .................................
testing/test_taskformula.py ......................
testing/test_yumrepoinfo.py ..............

============================================================= 272 passed in 4.82 seconds =============================================================
Test Plan

it works!

Diff Detail

Repository
rLTRN libtaskotron
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
kparal retitled this revision from to testing: rename test_directive to stub_directive.Apr 21 2015, 3:00 PM
kparal updated this object.
kparal edited the test plan for this revision. (Show Details)
kparal added reviewers: mkrizek, jskladan, tflink.
tflink accepted this revision.Apr 21 2015, 3:13 PM

sounds good to me

This revision is now accepted and ready to land.Apr 21 2015, 3:13 PM
Closed by commit rLTRN8169f23af532: test: rename test_directive to stub_directive (authored by kparal). · Explain WhyApr 21 2015, 3:48 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 935

View Options

testing/test_directives/stub_directive.py

  • This file was moved from testing/test_directives/test_directive.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​
6from libtaskotron.directives import BaseDirective 6​from libtaskotron.directives import BaseDirective
7 7​
8class TestDirective(BaseDirective): 8​class StubDirective(BaseDirective):
9 def process(self, command, input_data, env_data): 9​ def process(self, command, input_data, env_data):
10 return "this is just a test" 10​ return "this is just a stub"
View Options

testing/test_directives/test_directive.py

  • This file was moved to testing/test_directives/stub_directive.py.
View Options

testing/test_runner.py

Show First 20 Lines • Show All 116 Lines • ▼ Show 20 Line(s)107 def test_trivial_creation(self, tmpdir):
117 assert test_runner.taskdata == ref_taskdata 117​ assert test_runner.taskdata == ref_taskdata
118 118​
119class TestRunnerDirectiveLoader(): 119​class TestRunnerDirectiveLoader():
120 120​
121 def setup_method(self, method): 121​ def setup_method(self, method):
122 self.ref_dir = os.path.abspath('testing/test_directives/') 122​ self.ref_dir = os.path.abspath('testing/test_directives/')
123 self.ref_taskdata = {} 123​ self.ref_taskdata = {}
124 self.ref_inputdata = {} 124​ self.ref_inputdata = {}
125 self.ref_directivename = 'test' 125​ self.ref_directivename = 'stub'
126 126​
127 def test_runner_load_directive(self, tmpdir): 127​ def test_runner_load_directive(self, tmpdir):
128 test_runner = runner.Runner(self.ref_taskdata, self.ref_inputdata, 128​ test_runner = runner.Runner(self.ref_taskdata, self.ref_inputdata,
129 tmpdir) 129​ tmpdir)
130 130​
131 test_runner._load_directive(self.ref_directivename, self.ref_dir) 131​ test_runner._load_directive(self.ref_directivename, self.ref_dir)
132 132​
133 assert '%s_directive' % self.ref_directivename in sys.modules.keys() 133​ assert '%s_directive' % self.ref_directivename in sys.modules.keys()
▲ Show 20 Lines • Show All 321 Lines • Show Last 20 Lines