Merge branch 'fix-output-order-dictionary-keys' of https://github.com/ritvi-alagusankar/pytest into fix-output-order-dictionary-keys

ritvi-alagusankar · ritvi-alagusankar · commit 1ca88319390b · 2025-07-20T18:32:15.000+05:30
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.12.1"
+  rev: "v0.12.3"
   hooks:
     - id: ruff
       args: ["--fix"]
@@ -12,7 +12,7 @@ repos:
     -   id: end-of-file-fixer
     -   id: check-yaml
 - repo: https://github.com/woodruffw/zizmor-pre-commit
-  rev: v1.10.0
+  rev: v1.11.0
   hooks:
     - id: zizmor
 -   repo: https://github.com/adamchainz/blacken-docs
@@ -48,7 +48,7 @@ repos:
             # on <3.11
           - exceptiongroup>=1.0.0rc8
 -   repo: https://github.com/RobertCraigie/pyright-python
-    rev: v1.1.402
+    rev: v1.1.403
     hooks:
     -   id: pyright
         files: ^(src/|scripts/)
diff --git a/changelog/13478.bugfix.rst b/changelog/13478.bugfix.rst
@@ -0,0 +1 @@
+Fixed a crash when using :confval:`console_output_style` with ``times`` and a module is skipped.
diff --git a/changelog/478.feature.rst b/changelog/478.feature.rst
@@ -0,0 +1,3 @@
+Support PEP420 (implicit namespace packages) as `--pyargs` target when :confval:`consider_namespace_packages` is `true` in the config.
+
+Previously, this option only impacted package names, now it also impacts tests discovery.
diff --git a/doc/en/how-to/assert.rst b/doc/en/how-to/assert.rst
@@ -556,7 +556,7 @@ Note that you still get the benefits of assertion introspection, the only change
 the ``.pyc`` files won't be cached on disk.
 
 Additionally, rewriting will silently skip caching if it cannot write new ``.pyc`` files,
-i.e. in a read-only filesystem or a zipfile.
+e.g. in a read-only filesystem or a zipfile.
 
 
 Disabling assert rewriting
diff --git a/doc/en/how-to/doctest.rst b/doc/en/how-to/doctest.rst
@@ -307,7 +307,7 @@ While the built-in pytest support provides a good set of functionalities for usi
 doctests, if you use them extensively you might be interested in those external packages
 which add many more features, and include pytest integration:
 
-* `pytest-doctestplus <https://github.com/astropy/pytest-doctestplus>`__: provides
+* `pytest-doctestplus <https://github.com/scientific-python/pytest-doctestplus>`__: provides
   advanced doctest support and enables the testing of reStructuredText (".rst") files.
 
 * `Sybil <https://sybil.readthedocs.io>`__: provides a way to test examples in
diff --git a/doc/en/index.rst b/doc/en/index.rst
@@ -2,7 +2,7 @@
 
 .. sidebar:: **Next Open Trainings and Events**
 
-    - `pytest - simple, rapid and fun testing with Python <https://ep2025.europython.eu/session/pytest-simple-rapid-and-fun-testing-with-python/>`_, at `EuroPython 2025 <https://ep2025.europython.eu/>`_, **July 14th** (3h), Prague, Czech Republic
+    - `Testen mit pytest <https://www.letsboot.ch/kurs/pytest>`_ (German), via `Letsboot <https://www.letsboot.ch/>`_ (3 day in-depth training), **October 29th -- 31st**, Zurich (CH)
     - `Professional Testing with Python <https://python-academy.com/courses/python_course_testing.html>`_, via `Python Academy <https://www.python-academy.com/>`_ (3 day in-depth training), **March 3th -- 5th 2026**, Leipzig (DE) / Remote
 
     Also see :doc:`previous talks and blogposts <talks>`
diff --git a/doc/en/reference/plugin_list.rst b/doc/en/reference/plugin_list.rst
diff --git a/doc/en/reference/reference.rst b/doc/en/reference/reference.rst
@@ -1384,6 +1384,7 @@ passed multiple times. The expected format is ``name=value``. For example::
    when collecting Python modules. Default is ``False``.
 
    Set to ``True`` if the package you are testing is part of a namespace package.
+   Namespace packages are also supported as ``--pyargs`` target.
 
    Only `native namespace packages <https://packaging.python.org/en/latest/guides/packaging-namespace-packages/#native-namespace-packages>`__
    are supported, with no plans to support `legacy namespace packages <https://packaging.python.org/en/latest/guides/packaging-namespace-packages/#legacy-namespace-packages>`__.
diff --git a/src/_pytest/main.py b/src/_pytest/main.py
@@ -774,6 +774,9 @@ def perform_collect(
         self._collection_cache = {}
         self.items = []
         items: Sequence[nodes.Item | nodes.Collector] = self.items
+        consider_namespace_packages: bool = self.config.getini(
+            "consider_namespace_packages"
+        )
         try:
             initialpaths: list[Path] = []
             initialpaths_with_parents: list[Path] = []
@@ -782,6 +785,7 @@ def perform_collect(
                     self.config.invocation_params.dir,
                     arg,
                     as_pypath=self.config.option.pyargs,
+                    consider_namespace_packages=consider_namespace_packages,
                 )
                 self._initial_parts.append(collection_argument)
                 initialpaths.append(collection_argument.path)
@@ -981,7 +985,9 @@ def genitems(self, node: nodes.Item | nodes.Collector) -> Iterator[nodes.Item]:
                 node.ihook.pytest_collectreport(report=rep)
 
 
-def search_pypath(module_name: str) -> str | None:
+def search_pypath(
+    module_name: str, *, consider_namespace_packages: bool = False
+) -> str | None:
     """Search sys.path for the given a dotted module name, and return its file
     system path if found."""
     try:
@@ -991,13 +997,29 @@ def search_pypath(module_name: str) -> str | None:
     # ValueError: not a module name
     except (AttributeError, ImportError, ValueError):
         return None
-    if spec is None or spec.origin is None or spec.origin == "namespace":
+
+    if spec is None:
         return None
-    elif spec.submodule_search_locations:
-        return os.path.dirname(spec.origin)
-    else:
+
+    if (
+        spec.submodule_search_locations is None
+        or len(spec.submodule_search_locations) == 0
+    ):
+        # Must be a simple module.
         return spec.origin
 
+    if consider_namespace_packages:
+        # If submodule_search_locations is set, it's a package (regular or namespace).
+        # Typically there is a single entry, but documentation claims it can be empty too
+        #  (e.g. if the package has no physical location).
+        return spec.submodule_search_locations[0]
+
+    if spec.origin is None:
+        # This is only the case for namespace packages
+        return None
+
+    return os.path.dirname(spec.origin)
+
 
 @dataclasses.dataclass(frozen=True)
 class CollectionArgument:
@@ -1009,7 +1031,11 @@ class CollectionArgument:
 
 
 def resolve_collection_argument(
-    invocation_path: Path, arg: str, *, as_pypath: bool = False
+    invocation_path: Path,
+    arg: str,
+    *,
+    as_pypath: bool = False,
+    consider_namespace_packages: bool = False,
 ) -> CollectionArgument:
     """Parse path arguments optionally containing selection parts and return (fspath, names).
 
@@ -1049,7 +1075,9 @@ def resolve_collection_argument(
         parts[-1] = f"{parts[-1]}{squacket}{rest}"
     module_name = None
     if as_pypath:
-        pyarg_strpath = search_pypath(strpath)
+        pyarg_strpath = search_pypath(
+            strpath, consider_namespace_packages=consider_namespace_packages
+        )
         if pyarg_strpath is not None:
             module_name = strpath
             strpath = pyarg_strpath
diff --git a/src/_pytest/terminal.py b/src/_pytest/terminal.py
@@ -734,7 +734,9 @@ def _get_progress_information_message(self) -> str:
             last_in_module = tests_completed == tests_in_module
             if self.showlongtestinfo or last_in_module:
                 self._timing_nodeids_reported.update(r.nodeid for r in not_reported)
-                return format_node_duration(sum(r.duration for r in not_reported))
+                return format_node_duration(
+                    sum(r.duration for r in not_reported if isinstance(r, TestReport))
+                )
             return ""
         if collected:
             return f" [{len(self._progress_nodeids_reported) * 100 // collected:3d}%]"
diff --git a/testing/test_collection.py b/testing/test_collection.py
@@ -1935,3 +1935,64 @@ def test_func():
     result = pytester.runpytest()
     assert result.ret == 0
     result.stdout.fnmatch_lines(["*1 passed*"])
+
+
+@pytest.mark.parametrize("import_mode", ["prepend", "importlib", "append"])
+def test_namespace_packages(pytester: Pytester, import_mode: str):
+    pytester.makeini(
+        f"""
+        [pytest]
+        consider_namespace_packages = true
+        pythonpath = .
+        python_files = *.py
+        addopts = --import-mode {import_mode}
+    """
+    )
+    pytester.makepyfile(
+        **{
+            "pkg/module1.py": "def test_module1(): pass",
+            "pkg/subpkg_namespace/module2.py": "def test_module1(): pass",
+            "pkg/subpkg_regular/__init__.py": "",
+            "pkg/subpkg_regular/module3": "def test_module3(): pass",
+        }
+    )
+
+    # should collect when called with top-level package correctly
+    result = pytester.runpytest("--collect-only", "--pyargs", "pkg")
+    result.stdout.fnmatch_lines(
+        [
+            "collected 3 items",
+            "<Dir pkg>",
+            "  <Module module1.py>",
+            "    <Function test_module1>",
+            "  <Dir subpkg_namespace>",
+            "    <Module module2.py>",
+            "      <Function test_module1>",
+            "  <Package subpkg_regular>",
+            "    <Module module3.py>",
+            "      <Function test_module3>",
+        ]
+    )
+
+    # should also work when called against a more specific subpackage/module
+    result = pytester.runpytest("--collect-only", "--pyargs", "pkg.subpkg_namespace")
+    result.stdout.fnmatch_lines(
+        [
+            "collected 1 item",
+            "<Dir pkg>",
+            "  <Dir subpkg_namespace>",
+            "    <Module module2.py>",
+            "      <Function test_module1>",
+        ]
+    )
+
+    result = pytester.runpytest("--collect-only", "--pyargs", "pkg.subpkg_regular")
+    result.stdout.fnmatch_lines(
+        [
+            "collected 1 item",
+            "<Dir pkg>",
+            "  <Package subpkg_regular>",
+            "    <Module module3.py>",
+            "      <Function test_module3>",
+        ]
+    )
diff --git a/testing/test_error_diffs.py b/testing/test_error_diffs.py
@@ -274,7 +274,7 @@ def test_this():
         E               },
         E           }
                 """,
-                id="Compare nested dicts and check order of diff",
+        id="Compare nested dicts and check order of diff",
     ),
     pytest.param(
         """
diff --git a/testing/test_main.py b/testing/test_main.py
@@ -169,8 +169,13 @@ def test_dir(self, invocation_path: Path) -> None:
         ):
             resolve_collection_argument(invocation_path, "src/pkg::foo::bar")
 
-    def test_pypath(self, invocation_path: Path) -> None:
+    @pytest.mark.parametrize("namespace_package", [False, True])
+    def test_pypath(self, namespace_package: bool, invocation_path: Path) -> None:
         """Dotted name and parts."""
+        if namespace_package:
+            # Namespace package doesn't have to contain __init__py
+            (invocation_path / "src/pkg/__init__.py").unlink()
+
         assert resolve_collection_argument(
             invocation_path, "pkg.test", as_pypath=True
         ) == CollectionArgument(
@@ -186,7 +191,10 @@ def test_pypath(self, invocation_path: Path) -> None:
             module_name="pkg.test",
         )
         assert resolve_collection_argument(
-            invocation_path, "pkg", as_pypath=True
+            invocation_path,
+            "pkg",
+            as_pypath=True,
+            consider_namespace_packages=namespace_package,
         ) == CollectionArgument(
             path=invocation_path / "src/pkg",
             parts=[],
@@ -197,7 +205,10 @@ def test_pypath(self, invocation_path: Path) -> None:
             UsageError, match=r"package argument cannot contain :: selection parts"
         ):
             resolve_collection_argument(
-                invocation_path, "pkg::foo::bar", as_pypath=True
+                invocation_path,
+                "pkg::foo::bar",
+                as_pypath=True,
+                consider_namespace_packages=namespace_package,
             )
 
     def test_parametrized_name_with_colons(self, invocation_path: Path) -> None:
diff --git a/testing/test_terminal.py b/testing/test_terminal.py
@@ -112,6 +112,31 @@ def test_func():
             ["    def test_func():", ">       assert 0", "E       assert 0"]
         )
 
+    def test_console_output_style_times_with_skipped_and_passed(
+        self, pytester: Pytester
+    ) -> None:
+        pytester.makepyfile(
+            test_repro="""
+                def test_hello():
+                    pass
+            """,
+            test_repro_skip="""
+                import pytest
+                pytest.importorskip("fakepackage_does_not_exist")
+            """,
+        )
+        result = pytester.runpytest(
+            "test_repro.py",
+            "test_repro_skip.py",
+            "-o",
+            "console_output_style=times",
+        )
+
+        result.stdout.fnmatch_lines("* 1 passed, 1 skipped in *")
+
+        combined = "\n".join(result.stdout.lines + result.stderr.lines)
+        assert "INTERNALERROR" not in combined
+
     def test_internalerror(self, pytester: Pytester, linecomp) -> None:
         modcol = pytester.getmodulecol("def test_one(): pass")
         rep = TerminalReporter(modcol.config, file=linecomp.stringio)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fixed a crash when using :confval:`console_output_style` with ``times`` and a module is skipped.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+Support PEP420 (implicit namespace packages) as `--pyargs` target when :confval:`consider_namespace_packages` is `true` in the config.
	`2`	`+`
	`3`	`+Previously, this option only impacted package names, now it also impacts tests discovery.`