From d81489872559d55c327aa72865b810c0a0d7c735 Mon Sep 17 00:00:00 2001
From: Arkadiusz <arkadiusz.kasprzyk@swmansion.com>
Date: Fri, 8 Apr 2022 10:15:09 +0200
Subject: [PATCH] hotifx except_revert (#161)

---
 src/commands/test/runner.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/commands/test/runner.py b/src/commands/test/runner.py
index 053262c359..29d8c5a7ec 100644
--- a/src/commands/test/runner.py
+++ b/src/commands/test/runner.py
@@ -133,6 +133,9 @@ class ExpectedError:
     name: Optional[str]
     message: Optional[str]
 
+    def __str__(self) -> str:
+        return f"(error_type: {self.name}; error_message: {self.message})"
+
 
 class TestExecutionEnvironment:
     def __init__(self, is_test_fail_enabled: bool, include_paths: List[str]):
@@ -188,19 +191,26 @@ async def invoke_test_function(self, function_name: str):
                 call_result = await func().invoke()
                 if self._expected_error is not None:
                     raise MissingExceptException(
-                        f"Expected an exception matching the following regex: {self._expected_error.name}"
+                        f"Expected an exception matching the following error: {self._expected_error}"
                     )
                 if is_failure_expected:
                     raise TestNotFailedException()
                 return call_result
 
             except StarkException as ex:
-                is_ex_unexpected = self._expected_error is None or (
-                    self._expected_error.name == ex.code.name
-                    and self._expected_error.message == ex.message
+                is_ex_expected = (
+                    self._expected_error is not None
+                    and (
+                        self._expected_error.name is None
+                        or self._expected_error.name == ex.code.name
+                    )
+                    and (
+                        self._expected_error.message is None
+                        or (ex.message or "").startswith(self._expected_error.message)
+                    )
                 )
 
-                if is_ex_unexpected:
+                if not is_ex_expected:
                     raise StarkReportedException(ex) from ex
 
                 if is_failure_expected:
@@ -289,7 +299,7 @@ def deploy_contract(
     def expect_revert(self, expected_error: ExpectedError) -> Callable[[], None]:
         if self._expected_error is not None:
             raise MissingExceptException(
-                f"Protostar is already expecting an exception matching the following regex: {self._expected_error.name}"
+                f"Protostar is already expecting an exception matching the following error: {self._expected_error}"
             )
 
         self._expected_error = expected_error