Merge remote-tracking branch 'origin/develop'

sillsdev · Jun 3, 2024 · 3cb1498 · 3cb1498
2 parents b29f6ad + 31d98c5
commit 3cb1498
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/backend/Testing/ApiTests/ResetProjectRaceConditions.cs b/backend/Testing/ApiTests/ResetProjectRaceConditions.cs
@@ -27,9 +27,15 @@ public async Task SimultaneousResetsDontResultIn404s()
         var config2 = GetNewProjectConfig();
         var config3 = GetNewProjectConfig();
 
-        await using var project1 = await RegisterProjectInLexBox(config1, _adminApiTester);
-        await using var project2 = await RegisterProjectInLexBox(config2, _adminApiTester);
-        await using var project3 = await RegisterProjectInLexBox(config3, _adminApiTester);
+        var projects = await Task.WhenAll(
+            RegisterProjectInLexBox(config1, _adminApiTester),
+            RegisterProjectInLexBox(config2, _adminApiTester),
+            RegisterProjectInLexBox(config3, _adminApiTester)
+        );
+
+        await using var project1 = projects[0];
+        await using var project2 = projects[1];
+        await using var project3 = projects[2];
 
         var lastCommitBefore1 = await _adminApiTester.GetProjectLastCommit(config1.Code);
         var lastCommitBefore2 = await _adminApiTester.GetProjectLastCommit(config2.Code);

diff --git a/backend/Testing/Services/Utils.cs b/backend/Testing/Services/Utils.cs
@@ -61,6 +61,7 @@ ... on DbError {
                 }
             }
             """);
+        await WaitForHgRefreshIntervalAsync();
         return new LexboxProject(apiTester, config.Id);
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,6 +61,7 @@ ... on DbError { @@
                     }
                 }
                 """);
+            await WaitForHgRefreshIntervalAsync();
             return new LexboxProject(apiTester, config.Id);
         }
@@ Expand Down @@