Differential D38

Add --func and --long as short options to py.test.
AbandonedPublic
Actions

Authored by ralph on Mar 31 2014, 4:28 PM.

Details

Reviewers
kparal
tflink
mkrizek
Summary

This is for T89

Test Plan
Try running:

    py.test testing/
    py.test testing/ --func
    py.test testing/ --long
    py.test testing/ --func --long --functional

Are the expected test suites run?

Diff Detail

Branch
feature/short-opts
Lint
No Linters Available
Unit
No Unit Test Coverage
kparal added a comment.Apr 1 2014, 8:42 AM

It works. But do we really need three synonyms? :-)

I've found out that short lowecase options are reserved, but we can use uppercase ones. What about this (patch against develop)?

diff --git a/testing/conftest.py b/testing/conftest.py
index c49cac5..4bbbd20 100644
--- a/testing/conftest.py
+++ b/testing/conftest.py
@@ -30,7 +30,7 @@ def pytest_addoption(parser):
     should be detected and run
     """
 
-    parser.addoption('--functional', action='store_true', default=False,
+    parser.addoption('-F', '--functional', action='store_true', default=False,
                      help='Add functional tests')

Seems to work just fine:

$ py.test -F testing/
[libtaskotron:logger.py:63] 2014-04-01 10:40:10 DEBUG   doing stream logging
=========================================================== test session starts ============================================================
platform linux2 -- Python 2.7.5 -- py-1.4.20 -- pytest-2.5.2
plugins: cov
collected 79 items / 1 skipped 

testing/functest_python_directive.py ...
testing/test_bodhi_directive.py .......
testing/test_bodhi_utils.py ..
testing/test_check.py .....................
testing/test_koji_directive.py ..
testing/test_koji_utils.py ...
testing/test_python_directive.py ........
testing/test_python_utils.py ..
testing/test_runner.py ........................
testing/test_taskyaml.py .......

=================================================== 79 passed, 1 skipped in 0.42 seconds ===================================================
mkrizek added a comment.Apr 1 2014, 8:52 AM

+1 for the "-F" solution.

ralph abandoned this revision.Apr 1 2014, 1:40 PM

Yeah, "-F" is much better.

kparal added a comment.Apr 2 2014, 12:45 PM

@ralph, I assumed you would send an adjusted patch, but since you didn't, I've posted D39.

Revision Contents

Path
Mtesting/conftest.py (16 lines)

Diff 102

View Options

testing/conftest.py

Show All 24 Lines
25 25​
26 26​
27def pytest_addoption(parser): 27​def pytest_addoption(parser):
28 """ 28​ """
29 Add an option to the py.test parser to detect when the functional tests 29​ Add an option to the py.test parser to detect when the functional tests
30 should be detected and run 30​ should be detected and run
31 """ 31​ """
32 32​
33 parser.addoption('--functional', action='store_true', default=False, 33​ doc = "Add functional tests (synonyms: 'func', 'long', 'functional')"
34 help='Add functional tests') 34​ kwargs = dict(action='store_true', default=False, help=doc)
35​ parser.addoption('--functional', **kwargs)
36​ parser.addoption('--func', **kwargs)
37​ parser.addoption('--long', **kwargs)
35 38​
36 39​
37def pytest_ignore_collect(path, config): 40​def pytest_ignore_collect(path, config):
38 """Prevents collection of any files named functest* to speed up non 41​ """Prevents collection of any files named functest* to speed up non
39 integration tests""" 42​ integration tests"""
40 if path.fnmatch('*functest*'): 43​ if path.fnmatch('*functest*'):
41 try: 44​ is_functional = config.getvalue('functional')
42 is_functional = config.getvalue('functional') 45​ is_func = config.getvalue('func')
43 except KeyError: 46​ is_long = config.getvalue('long')
44 return True ​
45 47​
46 return not is_functional 48​ return not (is_functional or is_func or is_long)
47 49​
48 50​
49def pytest_configure(config): 51​def pytest_configure(config):
50 """Called after command line options have been parsed and all plugins and 52​ """Called after command line options have been parsed and all plugins and
51 initial conftest files been loaded.""" 53​ initial conftest files been loaded."""
52 54​
53 # enable debug logging for taskotron 55​ # enable debug logging for taskotron
54 # This will allow us to use libtaskotron-logged output for failed tests. 56​ # This will allow us to use libtaskotron-logged output for failed tests.
55 # You can also use "py.test -s" option to see all output even for passed 57​ # You can also use "py.test -s" option to see all output even for passed
56 # tests (of course, it's better to run the suite with just a single file 58​ # tests (of course, it's better to run the suite with just a single file
57 # rather than the whole directory in this case) 59​ # rather than the whole directory in this case)
58 libtaskotron.logger.init(level=logging.DEBUG) 60​ libtaskotron.logger.init(level=logging.DEBUG)