Updated timeout algorithm to version where time isn't used from statics.

by-pinja · Aug 20, 2018 · b7da6df · b7da6df
1 parent d21f50c
commit b7da6df
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Protacon.NetCore.WebApi.TestUtil/Extensions/CallResponseExtensions.cs b/Protacon.NetCore.WebApi.TestUtil/Extensions/CallResponseExtensions.cs
@@ -1,29 +1,32 @@
 using System;
 using System.Net;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace Protacon.NetCore.WebApi.TestUtil.Extensions
 {
     public static class CallResponseExtensions
     {
         public static Call WaitForStatusCode(this Call call, HttpStatusCode statusCode, TimeSpan timeout)
         {
-            DateTime endAt = DateTime.UtcNow.Add(timeout);
+            const int testPeriodMs = 500;
+            var timeUsedMs = 0;
 
-            while (true)
+            while(true)
             {
                 try
                 {
                     return call.Clone().ExpectStatusCode(statusCode);
                 }
                 catch (ExpectedStatusCodeException ex)
                 {
-                    if (DateTime.UtcNow > endAt)
+                    if (timeUsedMs > timeout.TotalMilliseconds)
                     {
                         throw ex;
                     }
 
-                    Thread.Sleep(500);
+                    timeUsedMs += testPeriodMs;
+                    Task.Delay(testPeriodMs).Wait();
                 }
             }
         }