Improve expect_error feedback (#16)

Co-authored-by: kazk <kazk.dev@gmail.com>

Author: Blind4Basics

codewars_test/test_framework.py

@@ -51,8 +51,8 @@ def expect_error(message, function, exception=Exception):
         function()
     except exception:
         passed = True
-    except Exception:
-        pass
+    except Exception as e:
+        message = "{}: {} should be {}".format(message or "Unexpected exception", repr(e), repr(exception))
     expect(passed, message)
 
 
@@ -62,7 +62,7 @@ def expect_no_error(message, function, exception=BaseException):
     except exception as e:
         fail("{}: {}".format(message or "Unexpected exception", repr(e)))
         return
-    except Exception:
+    except:
         pass
     pass_()
 

tests/fixtures/expect_error_sample.expected.txt

@@ -25,15 +25,15 @@
 
 <PASSED::>Test Passed
 
-<FAILED::>f1 did not raise ArithmeticError
+<FAILED::>f1 did not raise ArithmeticError: Exception() should be <class 'ArithmeticError'>
 
-<FAILED::>f1 did not raise ZeroDivisionError
+<FAILED::>f1 did not raise ZeroDivisionError: Exception() should be <class 'ZeroDivisionError'>
 
-<FAILED::>f1 did not raise LookupError
+<FAILED::>f1 did not raise LookupError: Exception() should be <class 'LookupError'>
 
-<FAILED::>f1 did not raise KeyError
+<FAILED::>f1 did not raise KeyError: Exception() should be <class 'KeyError'>
 
-<FAILED::>f1 did not raise OSError
+<FAILED::>f1 did not raise OSError: Exception() should be <class 'OSError'>
 
 <COMPLETEDIN::>0.02
 
@@ -47,11 +47,11 @@
 
 <PASSED::>Test Passed
 
-<FAILED::>f2 did not raise LookupError
+<FAILED::>f2 did not raise LookupError: ZeroDivisionError('integer division or modulo by zero') should be <class 'LookupError'>
 
-<FAILED::>f2 did not raise KeyError
+<FAILED::>f2 did not raise KeyError: ZeroDivisionError('integer division or modulo by zero') should be <class 'KeyError'>
 
-<FAILED::>f2 did not raise OSError
+<FAILED::>f2 did not raise OSError: ZeroDivisionError('integer division or modulo by zero') should be <class 'OSError'>
 
 <COMPLETEDIN::>0.02
 
@@ -61,16 +61,16 @@
 
 <PASSED::>Test Passed
 
-<FAILED::>f3 did not raise ArithmeticError
+<FAILED::>f3 did not raise ArithmeticError: KeyError(1) should be <class 'ArithmeticError'>
 
-<FAILED::>f3 did not raise ZeroDivisionError
+<FAILED::>f3 did not raise ZeroDivisionError: KeyError(1) should be <class 'ZeroDivisionError'>
 
 <PASSED::>Test Passed
 
 <PASSED::>Test Passed
 
-<FAILED::>f3 did not raise OSError
+<FAILED::>f3 did not raise OSError: KeyError(1) should be <class 'OSError'>
 
 <COMPLETEDIN::>0.02
 
-<COMPLETEDIN::>0.11
+<COMPLETEDIN::>0.11

tests/test_outputs.py

@@ -20,9 +20,11 @@ def test(self):
         )
         with open(expected_file, "r", encoding="utf-8") as r:
             # Allow duration to change
+            expected = re.sub(r"([()])", r"\\\1", r.read())
             expected = re.sub(
-                r"(?<=<COMPLETEDIN::>)\d+(?:\.\d+)?", r"\\d+(?:\\.\\d+)?", r.read()
+                r"(?<=<COMPLETEDIN::>)\d+(?:\.\d+)?", r"\\d+(?:\\.\\d+)?", expected
             )
+
             self.assertRegex(result.stdout.decode("utf-8"), expected)
 
     return test