diff options
| author |  Julien Boeuf <jboeuf@google.com> | 2015-08-26 11:19:10 -0700 |
|---|---|---|
| committer | Julien Boeuf <jboeuf@google.com> | 2015-08-26 11:19:10 -0700 |
| commit | 5b3516e2c5c3c6878d28cd19db73d5572851e6b9 (patch) | |
| tree | a34bde8ab374f35f5a6a6a4cdbdf741076dbd3fa /src/csharp/Grpc.Core.Tests/TimeoutsTest.cs | |
| parent | 9a8d0d3eaf8ccd1c3a6e27f1f8bbeeee85e64345 (diff) | |
| parent | 1f1919c8cfc61cd9af288cd1585b38b9c3511e1f (diff) | |
Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processor
Diffstat (limited to 'src/csharp/Grpc.Core.Tests/TimeoutsTest.cs')
| -rw-r--r-- | src/csharp/Grpc.Core.Tests/TimeoutsTest.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/csharp/Grpc.Core.Tests/TimeoutsTest.cs b/src/csharp/Grpc.Core.Tests/TimeoutsTest.cs index d875d601b9..41f661f62d 100644 --- a/src/csharp/Grpc.Core.Tests/TimeoutsTest.cs +++ b/src/csharp/Grpc.Core.Tests/TimeoutsTest.cs @@ -65,16 +65,10 @@ namespace Grpc.Core.Tests [TearDown] public void Cleanup() { - channel.Dispose(); + channel.ShutdownAsync().Wait(); server.ShutdownAsync().Wait(); } - [TestFixtureTearDown] - public void CleanupClass() - { - GrpcEnvironment.Shutdown(); - } - [Test] public void InfiniteDeadline() { |