terminal: fix progress report with duplicate nodeids

Fixes #6597.

Author: blueyed

changelog/6597.bugfix.rst

@@ -0,0 +1 @@
+Fix percentage progress report with duplicate nodeids.

src/_pytest/terminal.py

@@ -15,7 +15,6 @@
 from typing import List
 from typing import Mapping
 from typing import Optional
-from typing import Set
 from typing import Tuple
 
 import attr
@@ -258,7 +257,7 @@ def __init__(self, config: Config, file=None) -> None:
         self.reportchars = getreportopt(config)
         self.hasmarkup = self._tw.hasmarkup
         self.isatty = file.isatty()
-        self._progress_nodeids_reported = set()  # type: Set[str]
+        self._numreported = 0
         self._show_progress_info = self._determine_show_progress_info()
         self._collect_report_last_write = None  # type: Optional[float]
 
@@ -437,7 +436,8 @@ def pytest_runtest_logreport(self, report: TestReport) -> None:
             else:
                 self._tw.write(letter, **markup)
         else:
-            self._progress_nodeids_reported.add(rep.nodeid)
+            if rep.when == "call":
+                self._numreported += 1
             line = self._locationline(rep.nodeid, *rep.location)
             if not running_xdist:
                 self.write_ensure_prefix(line, word, **markup)
@@ -467,10 +467,8 @@ def pytest_runtest_logfinish(self, nodeid):
 
             main_color, _ = _get_main_color(self.stats)
 
-            self._progress_nodeids_reported.add(nodeid)
-            is_last_item = (
-                len(self._progress_nodeids_reported) == self._session.testscollected
-            )
+            self._numreported += 1
+            is_last_item = self._numreported == self._session.testscollected
             if is_last_item:
                 self._write_progress_information_filling_space(color=main_color)
             else:
@@ -485,16 +483,13 @@ def _get_progress_information_message(self) -> str:
         collected = self._session.testscollected
         if self._show_progress_info == "count":
             if collected:
-                progress = self._progress_nodeids_reported
                 counter_format = "{{:{}d}}".format(len(str(collected)))
                 format_string = " [{}/{{}}]".format(counter_format)
-                return format_string.format(len(progress), collected)
+                return format_string.format(self._numreported, collected)
             return " [ {} / {} ]".format(collected, collected)
         else:
             if collected:
-                return " [{:3d}%]".format(
-                    len(self._progress_nodeids_reported) * 100 // collected
-                )
+                return " [{:3d}%]".format(self._numreported * 100 // collected)
             return " [100%]"
 
     def _write_progress_information_filling_space(self, color=None):

testing/test_terminal.py

@@ -1593,6 +1593,31 @@ def test_normal(self, many_tests_files, testdir):
             ]
         )
 
+    def test_same_nodeids(self, testdir: Testdir) -> None:
+        p1 = testdir.makepyfile(
+            """
+            import pytest
+
+            @pytest.mark.parametrize("v", ["", " "])
+            @pytest.mark.parametrize("w", ["", " "])
+            def test(v, w):
+                pass
+            """
+        )
+        result = testdir.runpytest("-v", str(p1))
+        trans = str.maketrans({"[": "[[]", "]": "[]]"})
+        result.stdout.fnmatch_lines(
+            [
+                line.translate(trans)
+                for line in [
+                    "test_same_nodeids.py::test[] PASSED * [ 25%]",
+                    "test_same_nodeids.py::test[ ] PASSED * [ 50%]",
+                    "test_same_nodeids.py::test[ ] PASSED * [ 75%]",
+                    "test_same_nodeids.py::test[ - ] PASSED * [100%]",
+                ]
+            ]
+        )
+
     def test_colored_progress(self, testdir, monkeypatch):
         monkeypatch.setenv("PY_COLORS", "1")
         testdir.makepyfile(