Fix order of format args with warning

pytest-dev · Nov 7, 2019 · 2e5cf1c · 2e5cf1c
1 parent 8aa0809
commit 2e5cf1c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/_pytest/pathlib.py b/src/_pytest/pathlib.py
@@ -72,7 +72,7 @@ def on_rm_rf_error(func, path: str, exc, *, start_path: Path) -> bool:
             warnings.warn(
                 PytestWarning(
                     "(rm_rf) unknown function {} when removing {}:\n{}: {}".format(
-                        path, func, exctype, excvalue
+                        func, path, exctype, excvalue
                     )
                 )
             )

diff --git a/testing/test_tmpdir.py b/testing/test_tmpdir.py
@@ -388,7 +388,10 @@ def test_on_rm_rf_error(self, tmp_path):
         assert not on_rm_rf_error(None, str(fn), exc_info, start_path=tmp_path)
 
         # unknown function
-        with pytest.warns(pytest.PytestWarning):
+        with pytest.warns(
+            pytest.PytestWarning,
+            match=r"^\(rm_rf\) unknown function None when removing .*foo.txt:\nNone: ",
+        ):
             exc_info = (None, PermissionError(), None)
             on_rm_rf_error(None, str(fn), exc_info, start_path=tmp_path)
             assert fn.is_file()