Trying yet another strategy

ThreeMammals · Sep 24, 2023 · 1c97c39 · 1c97c39
1 parent 9fac778
commit 1c97c39
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/test/Ocelot.AcceptanceTests/ConfigurationReloadTests.cs b/test/Ocelot.AcceptanceTests/ConfigurationReloadTests.cs
@@ -42,8 +42,7 @@ public void should_reload_config_on_change()
             this.Given(x => _steps.GivenThereIsAConfiguration(_initialConfig))
                 .And(x => _steps.GivenOcelotIsRunningReloadingConfig(true))
                 .And(x => _steps.GivenThereIsAConfiguration(_anotherConfig))
-                .And(x => _steps.GivenIWait(7500))
-                .And(x => _steps.ThenConfigShouldBe(_anotherConfig))
+                .And(x => _steps.ThenConfigShouldBeWithTimeout(_anotherConfig, 10000))
                 .BDDfy();
         }
 

diff --git a/test/Ocelot.AcceptanceTests/Steps.cs b/test/Ocelot.AcceptanceTests/Steps.cs
@@ -65,15 +65,37 @@ public class Steps : IDisposable
         public async Task ThenConfigShouldBe(FileConfiguration fileConfig)
         {
             var internalConfigCreator = _ocelotServer.Host.Services.GetService<IInternalConfigurationCreator>();
-
             var internalConfigRepo = _ocelotServer.Host.Services.GetService<IInternalConfigurationRepository>();
-            var internalConfig = internalConfigRepo.Get();
 
+            var internalConfig = internalConfigRepo.Get();
             var config = await internalConfigCreator.Create(fileConfig);
 
             internalConfig.Data.RequestId.ShouldBe(config.Data.RequestId);
         }
 
+        public async Task ThenConfigShouldBeWithTimeout(FileConfiguration fileConfig, int timeoutMs)
+        {
+            var totalMs = 0;
+            var result = false;
+
+            while (!result && totalMs < timeoutMs)
+            {
+                result = await Wait.WaitFor(1000).Until(async () =>
+                {
+                    var internalConfigCreator = _ocelotServer.Host.Services.GetService<IInternalConfigurationCreator>();
+                    var internalConfigRepo = _ocelotServer.Host.Services.GetService<IInternalConfigurationRepository>();
+
+                    var internalConfig = internalConfigRepo.Get();
+                    var config = await internalConfigCreator.Create(fileConfig);
+
+                    return internalConfig.Data.RequestId == config.Data.RequestId;
+                });
+                totalMs += 1000;
+            }
+
+            result.ShouldBe(true);
+        }
+
         public async Task StartFakeOcelotWithWebSockets()
         {
             _ocelotBuilder = new WebHostBuilder();