Merge pull request #79 from nicoddemus/pytest-7-warnings-78

Author: nicoddemus

.github/workflows/deploy.yml

@@ -0,0 +1,32 @@
+name: deploy
+
+on:
+  push:
+    tags:
+      - "v*"
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Set up Python
+      uses: actions/setup-python@v1
+      with:
+        python-version: "3.9"
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install build
+
+    - name: Build package
+      run: |
+        python -m build
+
+    - name: Publish package to PyPI
+      uses: pypa/gh-action-pypi-publish@master
+      with:
+        user: __token__
+        password: ${{ secrets.pypi_token }}

.github/workflows/main.yml renamed to .github/workflows/test.yml

@@ -1,6 +1,10 @@
-name: build
+name: test
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - "*"
+  pull_request:
 
 jobs:
   compile:
@@ -29,6 +33,7 @@ jobs:
           sudo make install
       - name: Install Boost.Test
         run: |
+          sudo apt-get update
           sudo apt-get install libboost-test-dev valgrind
       - name: Compile
         run: |
@@ -50,7 +55,7 @@ jobs:
 
   test:
     needs: compile
-    runs-on: [ubuntu-latest]
+    runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
@@ -86,34 +91,3 @@ jobs:
     - name: Test
       run: |
         tox -e ${{ matrix.tox_env }}
-
-  deploy:
-
-    if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
-
-    runs-on: ubuntu-latest
-
-    needs: test
-
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: Set up Python
-      uses: actions/setup-python@v1
-      with:
-        python-version: "3.9"
-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install build
-
-    - name: Build package
-      run: |
-        python -m build
-
-    - name: Publish package to PyPI
-      uses: pypa/gh-action-pypi-publish@master
-      with:
-        user: __token__
-        password: ${{ secrets.pypi_token }}

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.1.2 (2022-03-18)
+
+- Fix warnings in pytest 7.0 ([#78](https://github.com/pytest-dev/pytest-cpp/issues/78)).
+
 # 2.1.1 (2021-12-06)
 
 - Fix corner-case issue when no result attribute is found in google test XML output file.

README.rst

@@ -16,7 +16,7 @@ and `Catch2 <https://github.com/catchorg/Catch2>`_:
 .. |anaconda| image:: https://img.shields.io/conda/vn/conda-forge/pytest-cpp.svg
     :target: https://anaconda.org/conda-forge/pytest-cpp
 
-.. |ci| image:: https://github.com/pytest-dev/pytest-cpp/workflows/build/badge.svg
+.. |ci| image:: https://github.com/pytest-dev/pytest-cpp/workflows/test/badge.svg
     :target: https://github.com/pytest-dev/pytest-cpp/actions
 
 .. |python| image:: https://img.shields.io/pypi/pyversions/pytest-cpp.svg

src/pytest_cpp/plugin.py

@@ -1,6 +1,7 @@
 import os
 import stat
 import sys
+from fnmatch import fnmatch
 
 import pytest
 
@@ -23,12 +24,12 @@ def matches_any_mask(path, masks):
     """Return True if the given path matches any of the masks given"""
     if sys.platform.startswith("win"):
         masks = [m + ".exe" for m in masks]
-    return any(path.fnmatch(m) for m in masks)
+    return any(fnmatch(path.name, m) for m in masks)
 
 
-def pytest_collect_file(parent, path):
+def pytest_collect_file(parent, file_path):
     try:
-        is_executable = os.stat(str(path)).st_mode & stat.S_IXUSR
+        is_executable = os.stat(str(file_path)).st_mode & stat.S_IXUSR
     except OSError:
         # in some situations the file might not be available anymore at this point
         is_executable = False
@@ -41,23 +42,30 @@ def pytest_collect_file(parent, path):
     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"):
+    if cpp_ignore_py_files and fnmatch(file_path.name, "*.py"):
         return
 
-    if not parent.session.isinitpath(path) and not matches_any_mask(path, masks):
+    if not parent.session.isinitpath(file_path) and not matches_any_mask(
+        file_path, masks
+    ):
         return
 
     for facade_class in FACADES:
-        if facade_class.is_test_suite(str(path)):
+        if facade_class.is_test_suite(str(file_path)):
             if needs_from_parent:
                 return CppFile.from_parent(
-                    fspath=path,
+                    path=file_path,
                     parent=parent,
                     facade=facade_class(),
                     arguments=test_args,
                 )
             else:
-                return CppFile(path, parent, facade_class(), test_args)
+                return CppFile(
+                    path=file_path,
+                    parent=parent,
+                    facade_class=facade_class(),
+                    arguments=test_args,
+                )
 
 
 def pytest_addoption(parser):
@@ -94,16 +102,15 @@ def pytest_addoption(parser):
 
 
 class CppFile(pytest.File):
-    def __init__(self, fspath, parent, facade, arguments):
-        pytest.File.__init__(self, fspath, parent)
+    def __init__(self, *, path, parent, facade, arguments, **kwargs):
+        pytest.File.__init__(self, path=path, parent=parent, **kwargs)
         self.facade = facade
         self._arguments = arguments
 
     @classmethod
-    def from_parent(cls, parent, fspath, facade, arguments):
-        # TODO: after dropping python 2, change to keyword only after 'parent'
+    def from_parent(cls, *, parent, path, facade, arguments, **kwargs):
         return super().from_parent(
-            parent=parent, fspath=fspath, facade=facade, arguments=arguments
+            parent=parent, path=path, facade=facade, arguments=arguments
         )
 
     def collect(self):
@@ -120,16 +127,15 @@ def collect(self):
 
 
 class CppItem(pytest.Item):
-    def __init__(self, name, parent, facade, arguments):
-        pytest.Item.__init__(self, name, parent)
+    def __init__(self, *, name, parent, facade, arguments, **kwargs):
+        pytest.Item.__init__(self, name, parent, **kwargs)
         self.facade = facade
         self._arguments = arguments
 
     @classmethod
-    def from_parent(cls, parent, name, facade, arguments):
-        # TODO: after dropping python 2, change to keyword only after 'parent'
+    def from_parent(cls, *, parent, name, facade, arguments, **kw):
         return super().from_parent(
-            name=name, parent=parent, facade=facade, arguments=arguments
+            name=name, parent=parent, facade=facade, arguments=arguments, **kw
         )
 
     def runtest(self):

tests/test_pytest_cpp.py

@@ -70,11 +70,11 @@ def test_list_tests(facade, name, expected, exes):
         (Catch2Facade(), "catch2_success", "gtest"),
     ],
 )
-def test_is_test_suite(facade, name, other_name, exes, tmpdir):
+def test_is_test_suite(facade, name, other_name, exes, tmp_path):
     assert facade.is_test_suite(exes.get(name))
     assert not facade.is_test_suite(exes.get(other_name))
-    tmpdir.ensure("foo.txt")
-    assert not facade.is_test_suite(str(tmpdir.join("foo.txt")))
+    tmp_path.joinpath("foo.txt").touch()
+    assert not facade.is_test_suite(str(tmp_path.joinpath("foo.txt")))
 
 
 @pytest.mark.parametrize(
@@ -228,7 +228,7 @@ def test_unknown_error(testdir, exes, mocker):
     assert "unknown error" in str(rep.longrepr)
 
 
-def test_google_internal_errors(mocker, testdir, exes, tmpdir):
+def test_google_internal_errors(mocker, testdir, exes, tmp_path):
     mocker.patch.object(GoogleTestFacade, "is_test_suite", return_value=True)
     mocker.patch.object(
         GoogleTestFacade, "list_tests", return_value=["FooTest.test_success"]
@@ -246,8 +246,8 @@ def raise_error(*args, **kwargs):
     assert "Internal Error: calling" in str(rep.longrepr)
 
     mocked.side_effect = None
-    xml_file = tmpdir.join("results.xml")
-    xml_file.write("<empty/>")
+    xml_file = tmp_path.joinpath("results.xml")
+    xml_file.write_text("<empty/>")
     mocker.patch.object(
         GoogleTestFacade, "_get_temp_xml_filename", return_value=str(xml_file)
     )
@@ -496,7 +496,7 @@ def test_passing_files_directly_in_command_line(testdir, exes):
     result.stdout.fnmatch_lines(["*1 passed*"])
 
 
-def test_race_condition_on_collect(tmpdir):
+def test_race_condition_on_collect(tmp_path):
     """
     Check that collection correctly handles when a path no longer is valid.
 
@@ -510,24 +510,29 @@ def test_race_condition_on_collect(tmpdir):
     """
     import pytest_cpp.plugin
 
-    assert pytest_cpp.plugin.pytest_collect_file(None, tmpdir / "invalid-file") is None
+    assert (
+        pytest_cpp.plugin.pytest_collect_file(None, tmp_path / "invalid-file") is None
+    )
 
 
-def test_exe_mask_on_windows(tmpdir, monkeypatch):
+def test_exe_mask_on_windows(tmp_path, monkeypatch):
     """
     Test for #45: C++ tests not collected due to '*_test' mask on Windows
     """
     import pytest_cpp.plugin
 
     monkeypatch.setattr(sys, "platform", "win32")
 
-    fn = tmpdir.join("generator_demo_test.exe").ensure(file=1)
+    fn = tmp_path.joinpath("generator_demo_test.exe")
+    fn.touch()
     assert pytest_cpp.plugin.matches_any_mask(fn, ["test_*", "*_test"])
 
-    fn = tmpdir.join("test_generator_demo.exe").ensure(file=1)
+    fn = tmp_path.joinpath("test_generator_demo.exe")
+    fn.touch()
     assert pytest_cpp.plugin.matches_any_mask(fn, ["test_*", "*_test"])
 
-    fn = tmpdir.join("my_generator_test_demo.exe").ensure(file=1)
+    fn = tmp_path.joinpath("my_generator_test_demo.exe")
+    fn.touch()
     assert not pytest_cpp.plugin.matches_any_mask(fn, ["test_*", "*_test"])
 
 
@@ -591,9 +596,9 @@ def test_get_whitespace(self):
         assert error.get_left_whitespace("  foo") == "  "
         assert error.get_left_whitespace("\t\t foo") == "\t\t "
 
-    def test_get_code_context_around_line(self, tmpdir):
-        f = tmpdir.join("foo.py")
-        f.write("line1\nline2\nline3\nline4\nline5")
+    def test_get_code_context_around_line(self, tmp_path):
+        f = tmp_path.joinpath("foo.py")
+        f.write_text("line1\nline2\nline3\nline4\nline5")
 
         assert error.get_code_context_around_line(str(f), 1) == ["line1"]
         assert error.get_code_context_around_line(str(f), 2) == ["line1", "line2"]
@@ -613,5 +618,5 @@ def test_get_code_context_around_line(self, tmpdir):
             "line5",
         ]
 
-        invalid = str(tmpdir.join("invalid"))
+        invalid = str(tmp_path.joinpath("invalid"))
         assert error.get_code_context_around_line(invalid, 10) == []