Make sure fixture resolving works in conftest.py, see #791

2020-01-06 23:27:25 +01:00
parent 9c4cd40b7e
commit d8deceb4b1
3 changed files with 14 additions and 6 deletions
--- a/test/run.py
+++ b/test/run.py
@@ -206,7 +206,7 @@ class IntegrationTestCase(BaseTestCase):
            TEST_GOTO: self.run_goto,
            TEST_REFERENCES: self.run_find_references,
        }
-        if self.path.endswith('pytest.py') \
+        if (self.path.endswith('pytest.py') or self.path.endswith('conftest.py')) \
                and environment.executable != os.path.realpath(sys.executable):
            # It's not guarantueed that pytest is installed in test
            # environments, if we're not running in the same environment that