Build fix for sshnet#396 of sshnet#395 : SftpClient Enumerates Rather…

… Than Accumulates Directory Items
znamenap · Sep 1, 2020 · 57adbee · 57adbee
1 parent f578c85
commit 57adbee
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest.EnumerateDirectory.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest.EnumerateDirectory.cs
@@ -155,27 +155,27 @@ public void Test_Sftp_EnumerateDirectory_HugeDirectory()
                     {
                         sftp.CreateDirectory(string.Format("test_{0}", i));
                     }
-                    Debug.WriteLine("Created {0} directories within {1} seconds", count, stopwatch.Elapsed.TotalSeconds);
+                    Debug.WriteLine(string.Format("Created {0} directories within {1} seconds", count, stopwatch.Elapsed.TotalSeconds));
 
-                    stopwatch.Restart();
+                    stopwatch.Reset(); stopwatch.Start();
                     var files = sftp.EnumerateDirectory(".");
-                    Debug.WriteLine("Listed {0} directories within {1} seconds", count, stopwatch.Elapsed.TotalSeconds);
+                    Debug.WriteLine(string.Format("Listed {0} directories within {1} seconds", count, stopwatch.Elapsed.TotalSeconds));
 
                     //  Ensure that directory has at least 10000 items
-                    stopwatch.Restart();
+                    stopwatch.Reset(); stopwatch.Start();
                     var actualCount = files.Count();
-                    Assert.IsTrue(actualCount >= 10000);
-                    Debug.WriteLine("Used {0} items within {1} seconds", actualCount, stopwatch.Elapsed.TotalSeconds);
+                    Assert.IsTrue(actualCount >= count);
+                    Debug.WriteLine(string.Format("Used {0} items within {1} seconds", actualCount, stopwatch.Elapsed.TotalSeconds));
 
                     sftp.Disconnect();
                 }
             }
             finally
             {
-                stopwatch.Restart();
+                stopwatch.Reset(); stopwatch.Start();
                 RemoveAllFiles();
                 stopwatch.Stop();
-                Debug.WriteLine("Removed all files within {0} seconds", stopwatch.Elapsed.TotalSeconds);
+                Debug.WriteLine(string.Format("Removed all files within {0} seconds", stopwatch.Elapsed.TotalSeconds));
             }
         }
 

diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest.ListDirectory.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest.ListDirectory.cs
@@ -154,27 +154,27 @@ public void Test_Sftp_ListDirectory_HugeDirectory()
                     {
                         sftp.CreateDirectory(string.Format("test_{0}", i));
                     }
-                    Debug.WriteLine("Created {0} directories within {1} seconds", count, stopwatch.Elapsed.TotalSeconds);
+                    Debug.WriteLine(string.Format("Created {0} directories within {1} seconds", count, stopwatch.Elapsed.TotalSeconds));
 
-                    stopwatch.Restart();
+                    stopwatch.Reset(); stopwatch.Start();
                     var files = sftp.ListDirectory(".");
-                    Debug.WriteLine("Listed {0} directories within {1} seconds", count, stopwatch.Elapsed.TotalSeconds);
+                    Debug.WriteLine(string.Format("Listed {0} directories within {1} seconds", count, stopwatch.Elapsed.TotalSeconds));
 
                     //  Ensure that directory has at least 10000 items
-                    stopwatch.Restart();
+                    stopwatch.Reset(); stopwatch.Start();
                     var actualCount = files.Count();
-                    Assert.IsTrue(actualCount >= 10000);
-                    Debug.WriteLine("Used {0} items within {1} seconds", actualCount, stopwatch.Elapsed.TotalSeconds);
+                    Assert.IsTrue(actualCount >= count);
+                    Debug.WriteLine(string.Format("Used {0} items within {1} seconds", actualCount, stopwatch.Elapsed.TotalSeconds));
 
                     sftp.Disconnect();
                 }
             }
             finally
             {
-                stopwatch.Restart();
+                stopwatch.Reset(); stopwatch.Start();
                 RemoveAllFiles();
                 stopwatch.Stop();
-                Debug.WriteLine("Removed all files within {0} seconds", stopwatch.Elapsed.TotalSeconds);
+                Debug.WriteLine(string.Format("Removed all files within {0} seconds", stopwatch.Elapsed.TotalSeconds));
             }
         }