Fixed a bug where the concurrent tests were failing due to directorie…

…s were created concurrently on ensure directory.
FoundatioFx · Sep 27, 2024 · 4710041 · 4710041
1 parent 75cbdcd
commit 4710041
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/Foundatio.Storage.SshNet/Storage/SshNetFileStorage.cs b/src/Foundatio.Storage.SshNet/Storage/SshNetFileStorage.cs
@@ -263,7 +263,7 @@ private void CreateDirectory(string path)
         string directory = NormalizePath(Path.GetDirectoryName(path));
         _logger.LogTrace("Ensuring {Directory} directory exists", directory);
 
-        string[] folderSegments = directory?.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries) ?? Array.Empty<string>();
+        string[] folderSegments = directory?.Split(['/'], StringSplitOptions.RemoveEmptyEntries) ?? [];
         string currentDirectory = String.Empty;
 
         foreach (string segment in folderSegments)
@@ -277,7 +277,15 @@ private void CreateDirectory(string path)
                 continue;
 
             _logger.LogInformation("Creating {Directory} directory", directory);
-            _client.CreateDirectory(currentDirectory);
+
+            try
+            {
+                _client.CreateDirectory(currentDirectory);
+            }
+            catch (Exception ex) when (_client.Exists(currentDirectory))
+            {
+                _logger.LogTrace(ex, "Error creating {Directory} directory: Already exists", directory);
+            }
         }
     }
 

diff --git a/tests/Foundatio.Storage.SshNet.Tests/Storage/RootedSshNetStorageTests.cs b/tests/Foundatio.Storage.SshNet.Tests/Storage/RootedSshNetStorageTests.cs
@@ -76,7 +76,7 @@ public override Task CanRenameFilesAsync()
         return base.CanRenameFilesAsync();
     }
 
-    [Fact(Skip = "Doesn't work well with SFTP")]
+    [Fact]
     public override Task CanConcurrentlyManageFilesAsync()
     {
         return base.CanConcurrentlyManageFilesAsync();

diff --git a/tests/Foundatio.Storage.SshNet.Tests/Storage/SshNetStorageTests.cs b/tests/Foundatio.Storage.SshNet.Tests/Storage/SshNetStorageTests.cs
@@ -76,7 +76,7 @@ public override Task CanRenameFilesAsync()
         return base.CanRenameFilesAsync();
     }
 
-    [Fact(Skip = "Doesn't work well with SFTP")]
+    [Fact]
     public override Task CanConcurrentlyManageFilesAsync()
     {
         return base.CanConcurrentlyManageFilesAsync();