Skip to content

Commit b5ef870

Browse files
committed
Use GetResult and dispose of command after tests
1 parent 85f002d commit b5ef870

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

test/Renci.SshNet.IntegrationTests/OldIntegrationTests/SshCommandTest.cs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,14 @@ public async Task Test_Execute_SingleCommandAsync()
5757
using (var client = new SshClient(SshServerHostName, SshServerPort, User.UserName, User.Password))
5858
{
5959
#region Example SshCommand CreateCommand ExecuteAsync
60-
client.Connect();
61-
60+
using var cts = new CancellationTokenSource();
61+
await client.ConnectAsync(cts.Token);
6262
var testValue = Guid.NewGuid().ToString();
63-
var cmd = client.CreateCommand($"echo {testValue}");
64-
await cmd.ExecuteAsync();
65-
using var reader = new StreamReader(cmd.OutputStream);
66-
var result = await reader.ReadToEndAsync();
67-
result = result.Substring(0, result.Length - 1);
63+
using var cmd = client.CreateCommand($"echo {testValue}");
64+
await cmd.ExecuteAsync(cts.Token);
6865
client.Disconnect();
66+
Assert.IsTrue(cmd.GetResult().Trim().Equals(testValue));
6967
#endregion
70-
71-
Assert.IsTrue(result.Equals(testValue));
7268
}
7369
}
7470

@@ -82,8 +78,8 @@ public async Task Test_Execute_SingleCommandAsync_WithCancelledToken()
8278
using var cts = new CancellationTokenSource();
8379
await client.ConnectAsync(cts.Token);
8480
var command = $"echo {Guid.NewGuid().ToString()};/bin/sleep 5";
85-
var cmd = client.CreateCommand(command);
86-
cts.CancelAfter(500);
81+
using var cmd = client.CreateCommand(command);
82+
cts.CancelAfter(100);
8783
await cmd.ExecuteAsync(cts.Token).ConfigureAwait(false);
8884
client.Disconnect();
8985
#endregion
@@ -287,7 +283,7 @@ public void Test_Execute_Command_Asynchronously()
287283

288284
cmd.EndExecute(asyncResult);
289285

290-
Assert.IsTrue(cmd.GetError() == "test\n");
286+
Assert.IsTrue(cmd.GetResult() == "test\n");
291287

292288
client.Disconnect();
293289
}

0 commit comments

Comments
 (0)