From ee54fb9a6b3d64224059201e6d3a2a238961e6e6 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sat, 13 Oct 2018 17:01:22 +0200 Subject: [PATCH] pytester: use EXIT_INTERRUPTED --- src/_pytest/pytester.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py index a50999172..e3bf060e3 100644 --- a/src/_pytest/pytester.py +++ b/src/_pytest/pytester.py @@ -19,7 +19,7 @@ from _pytest.capture import MultiCapture, SysCapture from _pytest._code import Source import py import pytest -from _pytest.main import Session, EXIT_OK +from _pytest.main import Session, EXIT_INTERRUPTED, EXIT_OK from _pytest.assertion.rewrite import AssertionRewritingHook from _pytest.compat import Path from _pytest.compat import safe_str @@ -845,7 +845,7 @@ class Testdir(object): # typically we reraise keyboard interrupts from the child run # because it's our user requesting interruption of the testing - if ret == 2 and not kwargs.get("no_reraise_ctrlc"): + if ret == EXIT_INTERRUPTED and not kwargs.get("no_reraise_ctrlc"): calls = reprec.getcalls("pytest_keyboard_interrupt") if calls and calls[-1].excinfo.type == KeyboardInterrupt: raise KeyboardInterrupt()