Merge pull request #521 from iamdefinitelyahuman/remove-pm-closing

Pytest minor fixes
eth-brownie · May 14, 2020 · 0a55f1c · 0a55f1c
2 parents 83ed8a4 + 135b7c5
commit 0a55f1c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/brownie/test/fixtures.py b/brownie/test/fixtures.py
@@ -101,9 +101,6 @@ def package_loader(project_id):
 
         yield package_loader
 
-        for project in _open_projects.values():
-            project.close(raises=False)
-
     @pytest.fixture
     def no_call_coverage(self):
         """

diff --git a/brownie/test/managers/master.py b/brownie/test/managers/master.py
@@ -6,6 +6,7 @@
 from xdist.scheduler import LoadFileScheduling
 
 from brownie._config import CONFIG
+from brownie.project import get_loaded_projects
 from brownie.test import coverage
 
 from .base import PytestBrownieBase
@@ -44,4 +45,6 @@ def pytest_sessionfinish(self, session):
             json.dump(report, fp, indent=2, sort_keys=True, default=sorted)
         coverage_eval = coverage.get_merged_coverage_eval(report["tx"])
         self._sessionfinish_coverage(coverage_eval)
-        self.project.close()
+
+        for project in get_loaded_projects():
+            project.close(raises=False)
diff --git a/brownie/test/managers/runner.py b/brownie/test/managers/runner.py
@@ -19,14 +19,18 @@
 from .base import PytestBrownieBase
 from .utils import convert_outcome
 
+SCOPE_ORDER = ("session", "package", "module", "class", "function")
+
 
 def _make_fixture_execute_first(metafunc, name, scope):
     fixtures = metafunc.fixturenames
+
+    scopes = SCOPE_ORDER[SCOPE_ORDER.index(scope) :]
     if name in fixtures:
         fixtures.remove(name)
         defs = metafunc._arg2fixturedefs
         idx = next(
-            (fixtures.index(i) for i in fixtures if i in defs and defs[i][0].scope == scope),
+            (fixtures.index(i) for i in fixtures if i in defs and defs[i][0].scope in scopes),
             len(fixtures),
         )
         fixtures.insert(idx, name)
@@ -285,7 +289,9 @@ def _sessionfinish(self, path):
             json.dump(report, fp, indent=2, sort_keys=True, default=sorted)
         coverage_eval = coverage.get_merged_coverage_eval()
         self._sessionfinish_coverage(coverage_eval)
-        self.project.close()
+
+        for project in brownie.project.get_loaded_projects():
+            project.close(raises=False)
 
 
 class PytestBrownieXdistRunner(PytestBrownieRunner):