diff options
author | David Garcia Quintas <dgq@google.com> | 2015-08-24 12:34:18 -0700 |
---|---|---|
committer | David Garcia Quintas <dgq@google.com> | 2015-08-24 12:34:18 -0700 |
commit | 02dda837da53aaa697a35d15c7d6bdd160ae8290 (patch) | |
tree | 3f99fd01b4a4e5c07d8b4e05567b9c6cc5a41771 /src/csharp/Grpc.Core.Tests/ClientServerTest.cs | |
parent | fe5f25490d4e290ecf2fc52de64c1230429fd0a3 (diff) | |
parent | 28ed2fbfb81f7ee9a9b449324f6c27062864b082 (diff) |
Merge branch 'master' of github.com:grpc/grpc into channel_args_compression
Diffstat (limited to 'src/csharp/Grpc.Core.Tests/ClientServerTest.cs')
-rw-r--r-- | src/csharp/Grpc.Core.Tests/ClientServerTest.cs | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/csharp/Grpc.Core.Tests/ClientServerTest.cs b/src/csharp/Grpc.Core.Tests/ClientServerTest.cs index e49fdb5268..68279a2007 100644 --- a/src/csharp/Grpc.Core.Tests/ClientServerTest.cs +++ b/src/csharp/Grpc.Core.Tests/ClientServerTest.cs @@ -63,16 +63,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 UnaryCall() { @@ -208,13 +202,6 @@ namespace Grpc.Core.Tests } [Test] - public void UnaryCall_DisposedChannel() - { - channel.Dispose(); - Assert.Throws(typeof(ObjectDisposedException), () => Calls.BlockingUnaryCall(helper.CreateUnaryCall(), "ABC")); - } - - [Test] public void UnaryCallPerformance() { helper.UnaryHandler = new UnaryServerMethod<string, string>(async (request, context) => |