Revert "TerminalReporter: remove _session"

This reverts commit c0ef76e.

Author: blueyed

src/_pytest/terminal.py

@@ -244,7 +244,7 @@ def __init__(self, config: Config, file=None) -> None:
 
         self.config = config
         self._numcollected = 0
-        self._testscollected = None  # type: Optional[int]
+        self._session = None  # type: Optional[Session]
         self._showfspath = None
 
         self.stats = {}  # type: Dict[str, List[Any]]
@@ -467,18 +467,13 @@ def pytest_runtest_logreport(self, report: TestReport) -> None:
 
     @property
     def _is_last_item(self):
-        return len(self._progress_nodeids_reported) == self._testscollected
-
-    # XXX
-    if "xdist" in sys.modules:
-
-        def pytest_xdist_node_collection_finished(self, node, ids):
-            self._testscollected = len(ids)
+        return len(self._progress_nodeids_reported) == self._session.testscollected
 
     def pytest_runtest_logfinish(self, nodeid):
+        assert self._session
         if self.verbosity <= 0 and self._show_progress_info:
             if self._show_progress_info == "count":
-                num_tests = self._testscollected
+                num_tests = self._session.testscollected
                 progress_length = len(" [{}/{}]".format(str(num_tests), str(num_tests)))
             else:
                 progress_length = len(" [100%]")
@@ -496,7 +491,8 @@ def pytest_runtest_logfinish(self, nodeid):
                     self._tw.write(msg + "\n", **{main_color: True})
 
     def _get_progress_information_message(self) -> str:
-        collected = self._testscollected
+        assert self._session
+        collected = self._session.testscollected
         if self._show_progress_info == "count":
             if collected:
                 progress = self._progress_nodeids_reported
@@ -587,6 +583,7 @@ def report_collect(self, final=False):
 
     @pytest.hookimpl(trylast=True)
     def pytest_sessionstart(self, session: Session) -> None:
+        self._session = session
         self._sessionstarttime = time.time()
         if not self.showheader:
             return
@@ -634,9 +631,7 @@ def pytest_report_header(self, config):
             result.append("plugins: %s" % ", ".join(_plugin_nameversions(plugininfo)))
         return result
 
-    def pytest_collection_finish(self, session: Session):
-        self._testscollected = len(session.items)
-
+    def pytest_collection_finish(self, session):
         self.report_collect(True)
 
         if self.config.getoption("collectonly"):