tests: don't assume anything about sys.excepthook

On Ubuntu (at least the 18.10 dev version) sys.excepthook is some apport_excepthook
object and not the default Python one. Our pytest extension was checking
that sys.excepthook is the default which made every test fail as a result.

Be less strict and don't assume anything about sys.excepthook instead.

1 files changed, 2 insertions, 4 deletions

diff --git a/tests/conftest.py b/tests/conftest.py
index 4d0cc6b0..820210ce 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -16,18 +16,16 @@ def pytest_runtest_call(item):
     like any signal handler, vfuncs tc)
     """
 
-    assert sys.excepthook is sys.__excepthook__
-
     exceptions = []
 
     def on_hook(type_, value, tback):
         exceptions.append((type_, value, tback))
 
+    orig_excepthook = sys.excepthook
     sys.excepthook = on_hook
     try:
         yield
     finally:
-        assert sys.excepthook in (on_hook, sys.__excepthook__)
-        sys.excepthook = sys.__excepthook__
+        sys.excepthook = orig_excepthook
         if exceptions:
             reraise(*exceptions[0])