From 411276b0876a2ec47518a22dafb1d3d787cfb311 Mon Sep 17 00:00:00 2001
From: Pavel Shevaev <pacha.shevaev@gmail.com>
Date: Mon, 2 Dec 2024 14:29:47 +0300
Subject: [PATCH] Trying to fix Windows related test

---
 tests/test_shared.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/test_shared.cs b/tests/test_shared.cs
index 295a3da8..0dae63e5 100644
--- a/tests/test_shared.cs
+++ b/tests/test_shared.cs
@@ -873,6 +873,8 @@ public void AssertError<T>(Action action, string msg, PlaceAssert place_assert =
 
   public void AssertError(Exception err, string msg, PlaceAssert place_assert = null)
   {
+    msg = msg.Replace("\r", "");
+
     if(err == null)
       Assert.Fail("No error happened, expected: " + msg);
 
@@ -883,16 +885,15 @@ public void AssertError(Exception err, string msg, PlaceAssert place_assert = nu
       err = (Exception)mex.errors[0];
     }
 
-    var err_str = err.ToString();
+    var err_str = err.ToString().Replace("\r", "");
     var idx = err_str.IndexOf(msg);
     if(idx == -1)
     {
-      Console.Error.WriteLine("Actual:\n" + err_str);
-      Console.Error.WriteLine("Expected:\n" + msg);
-
-      Assert.Fail("Sub-string not found");
+      Console.WriteLine("Actual:\n" + err_str);
+      Console.WriteLine("Expected:\n" + msg);
     }
 
+    Assert.Contains(msg, err_str);
 
     if(place_assert != null)
     {