add cpp_ignore_py_files option (enabled by default)

Author: fj128

pytest_cpp/plugin.py

@@ -23,10 +23,13 @@ def pytest_collect_file(parent, path):
         return
 
     config = parent.config
-    masks = config.getini('cpp_files') or DEFAULT_MASKS
-
-    test_args = config.getini(_ARGUMENTS) or ()
+    masks = config.getini('cpp_files')
+    test_args = config.getini('cpp_arguments')
+    cpp_ignore_py_files = config.getini('cpp_ignore_py_files')
 
+    # don't attempt to check *.py files even if they were given as explicit arguments
+    if cpp_ignore_py_files and path.fnmatch('*.py'):
+        return
     if not parent.session.isinitpath(path):
         for pat in masks:
             if path.fnmatch(pat):
@@ -39,13 +42,18 @@ def pytest_collect_file(parent, path):
 
 
 def pytest_addoption(parser):
-    parser.addini("cpp_files", type="args",
-        default=DEFAULT_MASKS,
-        help="glob-style file patterns for C++ test module discovery")
-    parser.addini(_ARGUMENTS,
-                  type='args',
-                  default='',
-                  help='Additional arguments for test executables')
+    parser.addini('cpp_files',
+            type='args',
+            default=DEFAULT_MASKS,
+            help="glob-style file patterns for C++ test module discovery")
+    parser.addini('cpp_arguments',
+            type='args',
+            default=(),
+            help='additional arguments for test executables')
+    parser.addini('cpp_ignore_py_files',
+            type='bool',
+            default=True,
+            help='ignore *.py files that otherwise match "cpp_files" patterns')
 
 
 class CppFile(pytest.File):

tests/SConstruct

@@ -9,6 +9,7 @@ else:
     LIBS = ['pthread']
 
 env = Environment(
+    CXX=os.environ.get('CXX'),
     CPPPATH=os.environ.get('INCLUDE'),
     CCFLAGS=CCFLAGS,
     LIBPATH=os.environ.get('LIBPATH'),

tests/test_pytest_cpp.py

@@ -1,3 +1,4 @@
+import sys
 import pytest
 import subprocess
 from pytest_cpp import error
@@ -260,6 +261,36 @@ def test_cpp_files_option(testdir, exes):
     ])
 
 
+# skip to avoid dealing with exes.get appending extension
+@pytest.mark.skipif(sys.platform.startswith('win'), reason='This is not a problem on Windows')
+def test_cpp_ignore_py_files(testdir, exes):
+    file_name = 'cpptest_success.py'
+    exes.get('gtest', 'cpptest_success.py')
+    testdir.makeini('''
+        [pytest]
+        cpp_files = cpptest_*
+    ''')
+
+    result = testdir.inline_run('--collect-only')
+    reps = result.getreports()
+    print(reps)
+    assert len(reps) == 1
+    assert reps[0].result == []
+
+    result = testdir.inline_run('--collect-only', '-o', 'cpp_ignore_py_files=False')
+    assert len(result.matchreport(exes.exe_name(file_name), when='collect').result) == 4
+
+    # running directly skips out machinery as well.
+    result = testdir.inline_run('--collect-only', file_name)
+    assert len(result.matchreport(exes.exe_name(file_name), when='collect').result) == 0
+
+    result = testdir.inline_run('--collect-only', '-o', 'cpp_ignore_py_files=False', file_name)
+    # assert len(result.matchreport(exes.exe_name(file_name)).result) == 4
+    # workaround for a pytest bug
+    print([(rep.nodeid.split("::"), len(rep.result)) for rep in result.getreports()])
+    assert any(file_name in rep.nodeid.split("::") and len(rep.result) == 4 for rep in result.getreports())
+
+
 def test_google_one_argument(testdir, exes):
     testdir.makeini('''
         [pytest]