From 76fb9970c8cc561e1ed6ee21fc10f46c60fc8637 Mon Sep 17 00:00:00 2001
From: Jose Carlos Menezes <jose@labcodes.com.br>
Date: Sun, 14 Oct 2018 18:43:48 -0300
Subject: [PATCH] Check if returncode is not None before assigning test return
 code

---
 src/_pytest/main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/_pytest/main.py b/src/_pytest/main.py
index c1896cdfa..2d6cea668 100644
--- a/src/_pytest/main.py
+++ b/src/_pytest/main.py
@@ -188,7 +188,8 @@ def wrap_session(config, doit):
             exitstatus = EXIT_INTERRUPTED
             if initstate <= 2 and isinstance(excinfo.value, exit.Exception):
                 sys.stderr.write("{}: {}\n".format(excinfo.typename, excinfo.value.msg))
-                exitstatus = excinfo.value.returncode
+                if excinfo.value.returncode is not None:
+                    exitstatus = excinfo.value.returncode
             config.hook.pytest_keyboard_interrupt(excinfo=excinfo)
             session.exitstatus = exitstatus
         except:  # noqa