floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1001 from RonnyPfannschmidt/exitcode-refactor 

restrucure pytest.main.wrap_session to allow for non-testrun wraps
This commit is contained in:
Bruno Oliveira 2015-09-14 15:56:04 -03:00
parent c5bf148ed7 81018f1996
commit b2b003dcac
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
_pytest/main.py
View File

@ -87,7 +87,7 @@ def wrap_session(config, doit):
initstate = 1 initstate = 1
config.hook.pytest_sessionstart(session=session) config.hook.pytest_sessionstart(session=session)
initstate = 2 initstate = 2
doit(config, session) session.exitstatus = doit(config, session) or 0
except pytest.UsageError: except pytest.UsageError:
raise raise
except KeyboardInterrupt: except KeyboardInterrupt:
@ -100,11 +100,7 @@ def wrap_session(config, doit):
session.exitstatus = EXIT_INTERNALERROR session.exitstatus = EXIT_INTERNALERROR
if excinfo.errisinstance(SystemExit): if excinfo.errisinstance(SystemExit):
sys.stderr.write("mainloop: caught Spurious SystemExit!\n") sys.stderr.write("mainloop: caught Spurious SystemExit!\n")
else:
if session.testsfailed:
session.exitstatus = EXIT_TESTSFAILED
elif session.testscollected == 0:
session.exitstatus = EXIT_NOTESTSCOLLECTED
finally: finally:
excinfo = None # Explicitly break reference cycle. excinfo = None # Explicitly break reference cycle.
session.startdir.chdir() session.startdir.chdir()
@ -124,6 +120,11 @@ def _main(config, session):
config.hook.pytest_collection(session=session) config.hook.pytest_collection(session=session)
config.hook.pytest_runtestloop(session=session) config.hook.pytest_runtestloop(session=session)
if session.testsfailed:
return EXIT_TESTSFAILED
elif session.testscollected == 0:
return EXIT_NOTESTSCOLLECTED
def pytest_collection(session): def pytest_collection(session):
return session.perform_collect() return session.perform_collect()