TargetWithContextNdlcSerializeTest - Investigate unstable test

NLog · Jan 29, 2021 · ca78fe8 · ca78fe8
1 parent d6e92fa
commit ca78fe8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,7 @@
 version: 4.7.0-{build}
 image:
   - Visual Studio 2017
-  - Ubuntu
+  - Previous Ubuntu
 configuration: Release
 build: no
 test: no
@@ -47,7 +47,7 @@ for:
   -
     matrix:
       only:
-        - image: Ubuntu
+        - image: Previous Ubuntu
     environment:
       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
       FrameworkPathOverride: /usr/lib/mono/4.6.1-api/

diff --git a/tests/NLog.UnitTests/Targets/TargetWithContextTest.cs b/tests/NLog.UnitTests/Targets/TargetWithContextTest.cs
@@ -110,7 +110,7 @@ public void TargetWithContextAsyncTest()
             ScopeContext.PushProperty("TestKey", "Hello Async World");
             ScopeContext.PushProperty("AsyncKey", "Hello Async World");
             logger.Debug("log message");
-            WaitForLastMessage(target);
+            Assert.True(WaitForLastMessage(target));
 
             Assert.NotEqual(0, target.LastMessage.Length);
             Assert.NotNull(target.LastCombinedProperties);
@@ -123,16 +123,17 @@ public void TargetWithContextAsyncTest()
             Assert.Contains(new KeyValuePair<string, object>("threadid", System.Environment.CurrentManagedThreadId.ToString()), target.LastCombinedProperties);
         }
 
-        private static void WaitForLastMessage(CustomTargetWithContext target)
+        private static bool WaitForLastMessage(CustomTargetWithContext target)
         {
             System.Threading.Thread.Sleep(1);
             for (int i = 0; i < 1000; ++i)
             {
                 if (target.LastMessage != null)
-                    break;
+                    return true;
 
                 System.Threading.Thread.Sleep(1);
             }
+            return false;
         }
 
         [Fact]
@@ -193,7 +194,7 @@ private static void WriteAndAssertSingleKey(CustomTargetWithContext target)
 
             logger.Debug("log message");
 
-            WaitForLastMessage(target);
+            Assert.True(WaitForLastMessage(target));
 
             Assert.Equal("{ a = b }", target.LastCombinedProperties["TestKey"]);
         }