diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-08-21 12:02:15 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-08-21 12:02:15 -0700 |
| commit | 1e9dd32803afed8db333a02aeca000c9ededf2cb (patch) | |
| tree | 715e14106d91f41c7022c8aa7a8fbcb997fbdec9 /src/csharp/Grpc.Core.Tests/ContextPropagationTest.cs | |
| parent | e13bfc0139b4ddb560ee3a0e085dbf518a5dabe5 (diff) | |
| parent | 3c807eac69acd711620aaf7ab44fd79ce406b35e (diff) | |
Merge branch 'master' into node_method_name_conflicts
Diffstat (limited to 'src/csharp/Grpc.Core.Tests/ContextPropagationTest.cs')
| -rw-r--r-- | src/csharp/Grpc.Core.Tests/ContextPropagationTest.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/csharp/Grpc.Core.Tests/ContextPropagationTest.cs b/src/csharp/Grpc.Core.Tests/ContextPropagationTest.cs index db5f953b0e..2db3f286f7 100644 --- a/src/csharp/Grpc.Core.Tests/ContextPropagationTest.cs +++ b/src/csharp/Grpc.Core.Tests/ContextPropagationTest.cs @@ -62,16 +62,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 async Task PropagateCancellation() { |