fixes pytest-dev#1210 adds stderr write for pytest.exit(msg) call

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,10 +2,7 @@ Thanks for submitting a PR, your contribution is really appreciated!
 
 Here's a quick checklist that should be present in PRs:
 
-- [ ] Target: for bug or doc fixes, target `master`; for new features, target `features`;
-- [ ] Make sure to include one or more tests for your change;
-- [ ] Add yourself to `AUTHORS`;
-- [ ] Add a new entry to `CHANGELOG.rst`
-  * Choose any open position to avoid merge conflicts with other PRs.
-  * Add a link to the issue you are fixing (if any) using RST syntax.
-  * The pytest team likes to have people to acknowledged in the `CHANGELOG`, so please add a thank note to yourself ("Thanks @user for the PR") and a link to your GitHub profile. It may sound weird thanking yourself, but otherwise a maintainer would have to do it manually before or after merging instead of just using GitHub's merge button. This makes it easier on the maintainers to merge PRs. 
+- [ ] Target: for bug or doc fixes, target `master`; for new features, target `features`
+- [ ] Make sure to include one or more tests for your change
+- [ ] Add yourself to `AUTHORS`
+- [ ] Add a new entry to the `CHANGELOG` (choose any open position to avoid merge conflicts with other PRs) 

AUTHORS

@@ -34,7 +34,6 @@ Dave Hunt
 David Díaz-Barquero
 David Mohr
 David Vierra
-Diego Russo
 Edison Gustavo Muenz
 Eduardo Schettino
 Elizaveta Shashkova
@@ -59,6 +58,7 @@ Jan Balster
 Janne Vanhala
 Jason R. Coombs
 John Towler
+Jon Sonesen
 Joshua Bronson
 Jurko Gospodnetić
 Katarzyna Jachim

CHANGELOG.rst

@@ -44,7 +44,9 @@
 
 * Updated docstrings with a more uniform style.
 
-*
+* Add stderr write for ``pytest.exit(msg)`` during startup. Previously the message was never shown.
+  Thanks `@BeyondEvil`_ for reporting `#1210`_. Thanks to `@JonathonSonesen`_ and
+  `@tomviner`_ for PR.
 
 * ImportErrors in plugins now are a fatal error instead of issuing a
   pytest warning (`#1479`_). Thanks to `@The-Compiler`_ for the PR.
@@ -58,6 +60,7 @@
 .. _#1503: https://github.com/pytest-dev/pytest/issues/1503
 .. _#1479: https://github.com/pytest-dev/pytest/issues/1479
 .. _#925: https://github.com/pytest-dev/pytest/issues/925
+.. _#1210: https://github.com/pytest-dev/pytest/issues/1210
 
 .. _@graingert: https://github.com/graingert
 .. _@taschini: https://github.com/taschini
@@ -67,6 +70,8 @@
 .. _@bagerard: https://github.com/bagerard
 .. _@davehunt: https://github.com/davehunt
 .. _@DRMacIver: https://github.com/DRMacIver
+.. _@BeyondEvil: https://github.com/BeyondEvil
+.. _@JonathonSonesen: https://github.com/JonathonSonesen
 
 
 2.9.2

_pytest/main.py

@@ -92,6 +92,11 @@ def wrap_session(config, doit):
             raise
         except KeyboardInterrupt:
             excinfo = _pytest._code.ExceptionInfo()
+            if initstate < 2 and isinstance(
+                    excinfo.value, pytest.exit.Exception):
+                excinfo = _pytest._code.ExceptionInfo()
+                sys.stderr.write('{0}: {1}\n'.format(
+                    type(excinfo.value).__name__, excinfo.value.msg))
             config.hook.pytest_keyboard_interrupt(excinfo=excinfo)
             session.exitstatus = EXIT_INTERRUPTED
         except:

testing/python/fixture.py

@@ -336,38 +336,6 @@ def test_spam(spam):
         result = testdir.runpytest(testfile)
         result.stdout.fnmatch_lines(["*3 passed*"])
 
-    def test_override_autouse_fixture_with_parametrized_fixture_conftest_conftest(self, testdir):
-        """Test override of the autouse fixture with parametrized one on the conftest level.
-        This test covers the issue explained in issue 1601
-        """
-        testdir.makeconftest("""
-            import pytest
-
-            @pytest.fixture(autouse=True)
-            def spam():
-                return 'spam'
-        """)
-        subdir = testdir.mkpydir('subdir')
-        subdir.join("conftest.py").write(_pytest._code.Source("""
-            import pytest
-
-            @pytest.fixture(params=[1, 2, 3])
-            def spam(request):
-                return request.param
-        """))
-        testfile = subdir.join("test_spam.py")
-        testfile.write(_pytest._code.Source("""
-            params = {'spam': 1}
-
-            def test_spam(spam):
-                assert spam == params['spam']
-                params['spam'] += 1
-        """))
-        result = testdir.runpytest()
-        result.stdout.fnmatch_lines(["*3 passed*"])
-        result = testdir.runpytest(testfile)
-        result.stdout.fnmatch_lines(["*3 passed*"])
-
     def test_autouse_fixture_plugin(self, testdir):
         # A fixture from a plugin has no baseid set, which screwed up
         # the autouse fixture handling.

testing/test_runner.py

@@ -457,6 +457,18 @@ def test_pytest_fail():
         s = excinfo.exconly(tryshort=True)
         assert s.startswith("Failed")
 
+def test_pytest_exit_msg(testdir):
+    testdir.makeconftest("""
+    import pytest
+
+    def pytest_configure(config):
+        pytest.exit('oh noes')
+    """)
+    result = testdir.runpytest()
+    result.stderr.fnmatch_lines([
+        "Exit: oh noes",
+    ])
+
 def test_pytest_fail_notrace(testdir):
     testdir.makepyfile("""
         import pytest