update tests

4 files changed, 0 insertions, 25 deletions

diff --git a/src/csharp/Grpc.Core.Tests/AppDomainUnloadTest.cs b/src/csharp/Grpc.Core.Tests/AppDomainUnloadTest.cs
index 60aae0e1e5..e605a310f9 100644
--- a/src/csharp/Grpc.Core.Tests/AppDomainUnloadTest.cs
+++ b/src/csharp/Grpc.Core.Tests/AppDomainUnloadTest.cs
@@ -70,13 +70,6 @@ namespace Grpc.Core.Tests
             /// </summary>
             public AppDomainTestClass()
             {
-                AppDomain.CurrentDomain.DomainUnload += (object sender, EventArgs e) =>
-                {
-                    var shutdownChannelsTask = GrpcEnvironment.ShutdownChannelsAsync();
-                    var killServersTask = GrpcEnvironment.KillServersAsync();
-                    Task.WaitAll(shutdownChannelsTask, killServersTask);
-                };
-
                 var helper = new MockServiceHelper(Host);
                 var server = helper.GetServer();
                 server.Start();
diff --git a/src/csharp/Grpc.Core.Tests/ShutdownHookClientTest.cs b/src/csharp/Grpc.Core.Tests/ShutdownHookClientTest.cs
index 32c9d8034a..12b8452f64 100644
--- a/src/csharp/Grpc.Core.Tests/ShutdownHookClientTest.cs
+++ b/src/csharp/Grpc.Core.Tests/ShutdownHookClientTest.cs
@@ -52,11 +52,6 @@ namespace Grpc.Core.Tests
         {
             var channel = new Channel(Host, 1000, ChannelCredentials.Insecure);
             var channel2 = new Channel(Host, 1001, ChannelCredentials.Insecure);
-            AppDomain.CurrentDomain.ProcessExit += (object sender, EventArgs e) =>
-            {
-                GrpcEnvironment.ShutdownChannelsAsync().Wait();
-            };
         }
-        // TODO: test what happens if there's an appdomain unload 
     }
 }
diff --git a/src/csharp/Grpc.Core.Tests/ShutdownHookPendingCallTest.cs b/src/csharp/Grpc.Core.Tests/ShutdownHookPendingCallTest.cs
index 7f3f493a48..175233840d 100644
--- a/src/csharp/Grpc.Core.Tests/ShutdownHookPendingCallTest.cs
+++ b/src/csharp/Grpc.Core.Tests/ShutdownHookPendingCallTest.cs
@@ -50,13 +50,6 @@ namespace Grpc.Core.Tests
         [Test]
         public void ProcessExitHookCanCleanupAbandonedCall()
         {
-            AppDomain.CurrentDomain.ProcessExit += (object sender, EventArgs e) =>
-            {
-                var shutdownChannelsTask = GrpcEnvironment.ShutdownChannelsAsync();
-                var killServersTask = GrpcEnvironment.KillServersAsync();
-                Task.WaitAll(shutdownChannelsTask, killServersTask);
-            };
-
             var helper = new MockServiceHelper(Host);
             var server = helper.GetServer();
             server.Start();
diff --git a/src/csharp/Grpc.Core.Tests/ShutdownHookServerTest.cs b/src/csharp/Grpc.Core.Tests/ShutdownHookServerTest.cs
index b223f5ee02..e7ea7a0bf5 100644
--- a/src/csharp/Grpc.Core.Tests/ShutdownHookServerTest.cs
+++ b/src/csharp/Grpc.Core.Tests/ShutdownHookServerTest.cs
@@ -53,12 +53,6 @@ namespace Grpc.Core.Tests
             var helper = new MockServiceHelper(Host);
             var server = helper.GetServer();
             server.Start();
-            AppDomain.CurrentDomain.ProcessExit += (object sender, EventArgs e) =>
-            {
-                var shutdownChannelsTask = GrpcEnvironment.ShutdownChannelsAsync();
-                var killServersTask = GrpcEnvironment.KillServersAsync();
-                Task.WaitAll(shutdownChannelsTask, killServersTask);
-            };
         }
     }
 }