Update change with tests and fixes for tests

2 files changed, 69 insertions, 8 deletions

diff --git a/coverage/execfile.py b/coverage/execfile.py
index 4db737c5..5633c59e 100644
--- a/coverage/execfile.py
+++ b/coverage/execfile.py
@@ -194,14 +194,15 @@ def run_python_file(filename, args, package=None, modulename=None, path0=None):
             getattr(err, '__context__', None)
 
             # call a custom user excepthook if it is provided
-            if sys.excepthook is not sys.__excepthook__:
-                try:
-                    sys.excepthook(typ, err, tb.tb_next)
-                except SystemExit:
-                    raise
-                except:
-                    typ, err, tb = sys.exc_info()
-            raise ExceptionDuringRun(typ, err, tb.tb_next)
+            try:
+                sys.excepthook(typ, err, tb.tb_next)
+            except SystemExit:
+                raise
+            except:
+                typ, err, tb = sys.exc_info()
+                raise ExceptionDuringRun(typ, err, tb.tb_next)
+            else:
+                sys.exit(1)
 
     finally:
         # Restore the old __main__, argv, and path.
diff --git a/tests/test_process.py b/tests/test_process.py
index 75d420a0..dda43ba8 100644
--- a/tests/test_process.py
+++ b/tests/test_process.py
@@ -785,6 +785,66 @@ class ProcessTest(CoverageTest):
         out = self.run_command("python -m coverage")
         self.assertIn("Use 'coverage help' for help", out)
 
+    def test_excepthook(self):
+        self.make_file("test_excepthook.py", """\
+            import sys
+
+            def excepthook(*args):
+                print('in excepthook')
+
+            sys.excepthook = excepthook
+
+            raise RuntimeError('Error Outside')
+            """)
+        cov_st, cov_out = self.run_command_status("coverage run test_excepthook.py")
+        py_st, py_out = self.run_command_status("python test_excepthook.py")
+        self.assertEqual(cov_st, py_st)
+        self.assertEqual(cov_st, 1)
+
+        self.assertIn("in excepthook", py_out)
+        self.assertEqual(cov_out, py_out)
+
+    def test_excepthook_exit(self):
+        self.make_file("test_excepthook_exit.py", """\
+            import sys
+
+            def excepthook(*args):
+                print('in excepthook')
+                sys.exit(0)
+
+            sys.excepthook = excepthook
+
+            raise RuntimeError('Error Outside')
+            """)
+        cov_st, cov_out = self.run_command_status("coverage run test_excepthook_exit.py")
+        py_st, py_out = self.run_command_status("python test_excepthook_exit.py")
+        self.assertEqual(cov_st, py_st)
+        self.assertEqual(cov_st, 0)
+
+        self.assertIn("in excepthook", py_out)
+        self.assertEqual(cov_out, py_out)
+
+    def test_excepthook_throw(self):
+        self.make_file("test_excepthook_exit.py", """\
+            import sys
+
+            def excepthook(*args):
+                print('in excepthook')
+                raise RuntimeError('Error Inside')
+
+            sys.excepthook = excepthook
+
+            raise RuntimeError('Error Outside')
+            """)
+        cov_st, cov_out = self.run_command_status("coverage run test_excepthook_exit.py")
+        py_st, py_out = self.run_command_status("python test_excepthook_exit.py")
+        self.assertEqual(cov_st, py_st)
+        self.assertEqual(cov_st, 0)
+
+        self.assertIn("in excepthook", py_out)
+        self.assertEqual(cov_out, py_out)
+
+
 
 class AliasedCommandTest(CoverageTest):
     """Tests of the version-specific command aliases."""