From 2f984e0c238be4450309a41e21acf62ff59b8526 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Thu, 26 May 2011 19:43:02 -0500 Subject: [PATCH] remove after_initial_collect hook --- _pytest/hookspec.py | 3 --- _pytest/main.py | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/_pytest/hookspec.py b/_pytest/hookspec.py index a2f3d6024..99ae77d55 100644 --- a/_pytest/hookspec.py +++ b/_pytest/hookspec.py @@ -79,9 +79,6 @@ def pytest_collect_file(path, parent): def pytest_collectstart(collector): """ collector starts collecting. """ -def pytest_after_initial_collect(collector): - """ after the initial file system walk before genitems""" - def pytest_itemcollected(item): """ we just collected a test item. """ diff --git a/_pytest/main.py b/_pytest/main.py index d58b42b12..bd1fcc095 100644 --- a/_pytest/main.py +++ b/_pytest/main.py @@ -394,10 +394,7 @@ class Session(FSCollector): self._initialparts.append(parts) self._initialpaths.add(parts[0]) self.ihook.pytest_collectstart(collector=self) - try: - rep = self.ihook.pytest_make_collect_report(collector=self) - finally: - self.ihook.pytest_after_initial_collect(collector=self) + rep = self.ihook.pytest_make_collect_report(collector=self) self.ihook.pytest_collectreport(report=rep) self.trace.root.indent -= 1 if self._notfound: