RavenDB-20808 fix test base

aviv86 · Jul 7, 2023 · b39aa49 · b39aa49
1 parent 840e9de
commit b39aa49
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/test/Tests.Infrastructure/RavenTestBase.Cluster.cs b/test/Tests.Infrastructure/RavenTestBase.Cluster.cs
@@ -211,12 +211,12 @@ public string GetRaftHistory(RavenServer server)
             return sb.ToString();
         }
 
-        public async Task WaitForRaftIndexToBeAppliedInClusterAsyncWithoutValidation(long index, TimeSpan? timeout = null, List<RavenServer> nodes = null)
+        public async Task WaitForRaftIndexToBeAppliedInClusterAsync(long index, TimeSpan? timeout = null, List<RavenServer> nodes = null)
         {
             await WaitForRaftIndexToBeAppliedOnClusterNodesAsync(index, nodes ?? _parent.Servers, timeout);
         }
 
-        public async Task WaitForRaftIndexToBeAppliedInClusterAsync(long index, TimeSpan? timeout = null, List<RavenServer> nodes = null)
+        public async Task WaitForRaftIndexToBeAppliedInClusterWithNodesValidationAsync(long index, TimeSpan? timeout = null, List<RavenServer> nodes = null)
         {
             var servers = nodes ?? _parent.Servers;
             var notDisposed = servers.Count(s => s.ServerStore.Disposed == false);

diff --git a/test/Tests.Infrastructure/RavenTestBase.cs b/test/Tests.Infrastructure/RavenTestBase.cs
@@ -234,7 +234,10 @@ protected virtual DocumentStore GetDocumentStore(Options options = null, [Caller
                     };
 
                     options.ModifyDocumentStore?.Invoke(store);
-                    store.Urls = GetUrls(serverToUse, store.Conventions.DisableTopologyUpdates);
+                    if (store.Urls.Length == 0)
+                    {
+                        store.Urls = GetUrls(serverToUse, store.Conventions.DisableTopologyUpdates);
+                    }
 
                     store.Initialize();
 
@@ -261,7 +264,7 @@ protected virtual DocumentStore GetDocumentStore(Options options = null, [Caller
                         if (servers.Count > 1)
                         {
                             var timeout = TimeSpan.FromMinutes(Debugger.IsAttached ? 5 : 1);
-                            AsyncHelpers.RunSync(async () => await Cluster.WaitForRaftIndexToBeAppliedInClusterAsyncWithoutValidation(raftCommand, timeout, servers));
+                            AsyncHelpers.RunSync(async () => await Cluster.WaitForRaftIndexToBeAppliedInClusterWithNodesValidationAsync(raftCommand, timeout, servers));
                         }
 
                         // skip 'wait for requests' on DocumentDatabase dispose
@@ -295,7 +298,7 @@ protected virtual DocumentStore GetDocumentStore(Options options = null, [Caller
                             if (servers.Count > 1 && result != null)
                             {
                                 var timeout = options.DeleteTimeout ?? TimeSpan.FromSeconds(Debugger.IsAttached ? 150 : 15);
-                                AsyncHelpers.RunSync(async () => await Cluster.WaitForRaftIndexToBeAppliedInClusterAsyncWithoutValidation(result.RaftCommandIndex, timeout, servers));
+                                AsyncHelpers.RunSync(async () => await Cluster.WaitForRaftIndexToBeAppliedInClusterAsync(result.RaftCommandIndex, timeout, servers));
                             }
                         }
                         catch (Exception e)

diff --git a/test/Tests.Infrastructure/TestBase.cs b/test/Tests.Infrastructure/TestBase.cs
@@ -256,12 +256,6 @@ public List<RavenServer> GetServers()
 
         public IEnumerable<RavenServer> GetServersInCluster(RavenServer server)
         {
-            if (Servers.Count == 0)
-            {
-                yield return server;
-                yield break;
-            }
-
             var topology = server.ServerStore.GetClusterTopology().TopologyId;
             foreach (var s in Servers)
             {
@@ -593,7 +587,7 @@ protected static string[] UseFiddler(string url)
 
         protected string[] GetUrls(RavenServer serverToUse, bool disableTopologyUpdates = false)
         {
-            if (disableTopologyUpdates)
+            if (disableTopologyUpdates || Servers.Count == 0 || Servers.Contains(serverToUse) == false)
                 return UseFiddler(serverToUse.WebUrl);
 
             return GetServersInCluster(serverToUse).Select(s => UseFiddlerUrl(s.WebUrl)).ToArray();