holger krekel avatar holger krekel committed d46b448

avoid double-instantiation of PluginManager in case of the "python pytest.py" or -m pytest invocation

Comments (0)

Files changed (1)

 """
-unit and functional testing with Python.
+pytest: unit and functional testing with Python.
 """
 __all__ = ['main']
 
-from _pytest.core import main, UsageError, _preloadplugins
-from _pytest import core as cmdline
-from _pytest import __version__
-
 if __name__ == '__main__': # if run as a script or by 'python -m pytest'
-    raise SystemExit(main())
+    # we trigger the below "else" condition by the following import
+    import pytest
+    raise SystemExit(pytest.main())
 else:
+    # we are simply imported
+    from _pytest.core import main, UsageError, _preloadplugins
+    from _pytest import core as cmdline
+    from _pytest import __version__
     _preloadplugins() # to populate pytest.* namespace so help(pytest) works
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.