aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/csharp/Grpc.IntegrationTesting/SslCredentialsTest.cs
diff options
context:
space:
mode:
authorGravatar Julien Boeuf <jboeuf@google.com>2015-08-24 23:55:43 -0700
committerGravatar Julien Boeuf <jboeuf@google.com>2015-08-24 23:55:43 -0700
commit0382bfae38ca7594e55e941087f8095eb7493a4e (patch)
tree925bd59036b7e27fb4ea4a7aa8d59862f413fc2b /src/csharp/Grpc.IntegrationTesting/SslCredentialsTest.cs
parent8fd915ab8dfaf2a451fc46ecf225ea4d4400c64b (diff)
parente289e52436505e73440854ee6f8e5ddda5750929 (diff)
Merge branch 'master' of github.com:grpc/grpc into cpp_string_ref
Diffstat (limited to 'src/csharp/Grpc.IntegrationTesting/SslCredentialsTest.cs')
-rw-r--r--src/csharp/Grpc.IntegrationTesting/SslCredentialsTest.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/csharp/Grpc.IntegrationTesting/SslCredentialsTest.cs b/src/csharp/Grpc.IntegrationTesting/SslCredentialsTest.cs
index 1c398eb84e..842795374f 100644
--- a/src/csharp/Grpc.IntegrationTesting/SslCredentialsTest.cs
+++ b/src/csharp/Grpc.IntegrationTesting/SslCredentialsTest.cs
@@ -85,9 +85,8 @@ namespace Grpc.IntegrationTesting
[TestFixtureTearDown]
public void Cleanup()
{
- channel.Dispose();
+ channel.ShutdownAsync().Wait();
server.ShutdownAsync().Wait();
- GrpcEnvironment.Shutdown();
}
[Test]