Go back to running proper HgService code

Stop trying to make tests fail, and try to make them pass again
sillsdev · May 29, 2024 · 1141de1 · 1141de1
1 parent 28201a6
commit 1141de1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 29 deletions.
diff --git a/backend/LexBoxApi/Services/HgService.cs b/backend/LexBoxApi/Services/HgService.cs
@@ -273,26 +273,24 @@ public async Task<HttpContent> ExecuteHgRecover(string code, CancellationToken t
         return response;
     }
 
-    public Task InvalidateDirCache(string code)
+    public Task<HttpContent> InvalidateDirCache(string code)
     {
-        // Try very hard to fail tests again
-        // var repoPath = Path.Join(PrefixRepoFilePath(code));
-        // if (Directory.Exists(repoPath))
-        // {
-        //     // Invalidate NFS directory cache by forcing a write and re-read of the repo directory
-        //     var randomPath = Path.Join(repoPath, Path.GetRandomFileName());
-        //     while (File.Exists(randomPath) || Directory.Exists(randomPath)) { randomPath = Path.Join(repoPath, Path.GetRandomFileName()); }
-        //     try
-        //     {
-        //         // Create and delete a directory since that's slightly safer than a file
-        //         var d = Directory.CreateDirectory(randomPath);
-        //         d.Delete();
-        //     }
-        //     catch (Exception) { }
-        // }
-        return Task.CompletedTask;
-        // var result = ExecuteHgCommandServerCommand(code, "invalidatedircache", default);
-        // return result;
+        var repoPath = Path.Join(PrefixRepoFilePath(code));
+        if (Directory.Exists(repoPath))
+        {
+            // Invalidate NFS directory cache by forcing a write and re-read of the repo directory
+            var randomPath = Path.Join(repoPath, Path.GetRandomFileName());
+            while (File.Exists(randomPath) || Directory.Exists(randomPath)) { randomPath = Path.Join(repoPath, Path.GetRandomFileName()); }
+            try
+            {
+                // Create and delete a directory since that's slightly safer than a file
+                var d = Directory.CreateDirectory(randomPath);
+                d.Delete();
+            }
+            catch (Exception) { }
+        }
+        var result = ExecuteHgCommandServerCommand(code, "invalidatedircache", default);
+        return result;
     }
 
     public async Task<string> GetTipHash(string code)
@@ -307,15 +305,14 @@ public async Task WaitForRepoEmptyState(string code, RepoEmptyState expectedStat
         var done = false;
         while (!done)
         {
-            done = true; // Deliberately try to fail tests
-            // var hash = await GetTipHash(code);
-            // var isEmpty = hash == AllZeroHash;
-            // done = expectedState switch
-            // {
-            //     RepoEmptyState.Empty => isEmpty,
-            //     RepoEmptyState.NonEmpty => !isEmpty
-            // };
-            // if (!done) await Task.Delay(2500);
+            var hash = await GetTipHash(code);
+            var isEmpty = hash == AllZeroHash;
+            done = expectedState switch
+            {
+                RepoEmptyState.Empty => isEmpty,
+                RepoEmptyState.NonEmpty => !isEmpty
+            };
+            if (!done) await Task.Delay(2500);
         }
     }
 

diff --git a/backend/LexCore/ServiceInterfaces/IHgService.cs b/backend/LexCore/ServiceInterfaces/IHgService.cs
@@ -19,7 +19,7 @@ public interface IHgService
     Task<int?> GetLexEntryCount(string code, ProjectType projectType);
     Task<string?> GetRepositoryIdentifier(Project project);
     Task<HttpContent> ExecuteHgRecover(string code, CancellationToken token);
-    Task InvalidateDirCache(string code);
+    Task<HttpContent> InvalidateDirCache(string code);
     bool HasAbandonedTransactions(string projectCode);
     Task<string> HgCommandHealth();
 }