Build fix for sshnet#396 of sshnet#395 : SftpClient Enumerates Rather Than Accumulates Directory Items

znamenap · znamenap · commit 57adbee99cd1 · 2020-09-01T23:23:46.000+02:00
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));
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -155,27 +155,27 @@ public void Test_Sftp_EnumerateDirectory_HugeDirectory()`
`155`	`155`	`{`
`156`	`156`	`sftp.CreateDirectory(string.Format("test_{0}", i));`
`157`	`157`	`}`
`158`		`- Debug.WriteLine("Created {0} directories within {1} seconds", count, stopwatch.Elapsed.TotalSeconds);`
	`158`	`+ Debug.WriteLine(string.Format("Created {0} directories within {1} seconds", count, stopwatch.Elapsed.TotalSeconds));`
`159`	`159`
`160`		`- stopwatch.Restart();`
	`160`	`+ stopwatch.Reset(); stopwatch.Start();`
`161`	`161`	`var files = sftp.EnumerateDirectory(".");`
`162`		`- Debug.WriteLine("Listed {0} directories within {1} seconds", count, stopwatch.Elapsed.TotalSeconds);`
	`162`	`+ Debug.WriteLine(string.Format("Listed {0} directories within {1} seconds", count, stopwatch.Elapsed.TotalSeconds));`
`163`	`163`
`164`	`164`	`// Ensure that directory has at least 10000 items`
`165`		`- stopwatch.Restart();`
	`165`	`+ stopwatch.Reset(); stopwatch.Start();`
`166`	`166`	`var actualCount = files.Count();`
`167`		`- Assert.IsTrue(actualCount >= 10000);`
`168`		`- Debug.WriteLine("Used {0} items within {1} seconds", actualCount, stopwatch.Elapsed.TotalSeconds);`
	`167`	`+ Assert.IsTrue(actualCount >= count);`
	`168`	`+ Debug.WriteLine(string.Format("Used {0} items within {1} seconds", actualCount, stopwatch.Elapsed.TotalSeconds));`
`169`	`169`
`170`	`170`	`sftp.Disconnect();`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`	`finally`
`174`	`174`	`{`
`175`		`- stopwatch.Restart();`
	`175`	`+ stopwatch.Reset(); stopwatch.Start();`
`176`	`176`	`RemoveAllFiles();`
`177`	`177`	`stopwatch.Stop();`
`178`		`- Debug.WriteLine("Removed all files within {0} seconds", stopwatch.Elapsed.TotalSeconds);`
	`178`	`+ Debug.WriteLine(string.Format("Removed all files within {0} seconds", stopwatch.Elapsed.TotalSeconds));`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`
Original file line number	Diff line number	Diff line change
`@@ -154,27 +154,27 @@ public void Test_Sftp_ListDirectory_HugeDirectory()`
`154`	`154`	`{`
`155`	`155`	`sftp.CreateDirectory(string.Format("test_{0}", i));`
`156`	`156`	`}`
`157`		`- Debug.WriteLine("Created {0} directories within {1} seconds", count, stopwatch.Elapsed.TotalSeconds);`
	`157`	`+ Debug.WriteLine(string.Format("Created {0} directories within {1} seconds", count, stopwatch.Elapsed.TotalSeconds));`
`158`	`158`
`159`		`- stopwatch.Restart();`
	`159`	`+ stopwatch.Reset(); stopwatch.Start();`
`160`	`160`	`var files = sftp.ListDirectory(".");`
`161`		`- Debug.WriteLine("Listed {0} directories within {1} seconds", count, stopwatch.Elapsed.TotalSeconds);`
	`161`	`+ Debug.WriteLine(string.Format("Listed {0} directories within {1} seconds", count, stopwatch.Elapsed.TotalSeconds));`
`162`	`162`
`163`	`163`	`// Ensure that directory has at least 10000 items`
`164`		`- stopwatch.Restart();`
	`164`	`+ stopwatch.Reset(); stopwatch.Start();`
`165`	`165`	`var actualCount = files.Count();`
`166`		`- Assert.IsTrue(actualCount >= 10000);`
`167`		`- Debug.WriteLine("Used {0} items within {1} seconds", actualCount, stopwatch.Elapsed.TotalSeconds);`
	`166`	`+ Assert.IsTrue(actualCount >= count);`
	`167`	`+ Debug.WriteLine(string.Format("Used {0} items within {1} seconds", actualCount, stopwatch.Elapsed.TotalSeconds));`
`168`	`168`
`169`	`169`	`sftp.Disconnect();`
`170`	`170`	`}`
`171`	`171`	`}`
`172`	`172`	`finally`
`173`	`173`	`{`
`174`		`- stopwatch.Restart();`
	`174`	`+ stopwatch.Reset(); stopwatch.Start();`
`175`	`175`	`RemoveAllFiles();`
`176`	`176`	`stopwatch.Stop();`
`177`		`- Debug.WriteLine("Removed all files within {0} seconds", stopwatch.Elapsed.TotalSeconds);`
	`177`	`+ Debug.WriteLine(string.Format("Removed all files within {0} seconds", stopwatch.Elapsed.TotalSeconds));`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`