Address comments, improve tests

3 files changed, 13 insertions, 26 deletions

diff --git a/src/python/grpcio_tests/tests/unit/BUILD.bazel b/src/python/grpcio_tests/tests/unit/BUILD.bazel
index 4f850220f8..7a910fd9fe 100644
--- a/src/python/grpcio_tests/tests/unit/BUILD.bazel
+++ b/src/python/grpcio_tests/tests/unit/BUILD.bazel
@@ -28,6 +28,7 @@ GRPCIO_TESTS_UNIT = [
     # TODO(ghostwriternr): To be added later.
     # "_server_ssl_cert_config_test.py",
     "_server_test.py",
+    "_server_shutdown_test.py",
     "_session_cache_test.py",
 ]
 
diff --git a/src/python/grpcio_tests/tests/unit/_server_shutdown_scenarios.py b/src/python/grpcio_tests/tests/unit/_server_shutdown_scenarios.py
index acbec0f77d..1797e9bbfe 100644
--- a/src/python/grpcio_tests/tests/unit/_server_shutdown_scenarios.py
+++ b/src/python/grpcio_tests/tests/unit/_server_shutdown_scenarios.py
@@ -20,6 +20,7 @@ import time
 import logging
 
 import grpc
+from tests.unit import test_common
 
 from concurrent import futures
 from six.moves import queue
@@ -36,37 +37,24 @@ SERVER_FORK_CAN_EXIT = 'server_fork_can_exit'
 FORK_EXIT = '/test/ForkExit'
 
 
-class ForkExitHandler(object):
-
-    def unary_unary(self, request, servicer_context):
-        pid = os.fork()
-        if pid == 0:
-            os._exit(0)
-        return RESPONSE
-
-    def __init__(self):
-        self.request_streaming = None
-        self.response_streaming = None
-        self.request_deserializer = None
-        self.response_serializer = None
-        self.unary_stream = None
-        self.stream_unary = None
-        self.stream_stream = None
+def fork_and_exit(request, servicer_context):
+    pid = os.fork()
+    if pid == 0:
+        os._exit(0)
+    return RESPONSE
 
 
 class GenericHandler(grpc.GenericRpcHandler):
 
     def service(self, handler_call_details):
         if handler_call_details.method == FORK_EXIT:
-            return ForkExitHandler()
+            return grpc.unary_unary_rpc_method_handler(fork_and_exit)
         else:
             return None
 
 
 def run_server(port_queue):
-    server = grpc.server(
-        futures.ThreadPoolExecutor(max_workers=10),
-        options=(('grpc.so_reuseport', 0),))
+    server = test_common.test_server()
     port = server.add_insecure_port('[::]:0')
     port_queue.put(port)
     server.add_generic_rpc_handlers((GenericHandler(),))
@@ -78,15 +66,11 @@ def run_server(port_queue):
 
 def run_test(args):
     if args.scenario == SERVER_RAISES_EXCEPTION:
-        server = grpc.server(
-            futures.ThreadPoolExecutor(max_workers=1),
-            options=(('grpc.so_reuseport', 0),))
+        server = test_common.test_server()
         server.start()
         raise Exception()
     elif args.scenario == SERVER_DEALLOCATED:
-        server = grpc.server(
-            futures.ThreadPoolExecutor(max_workers=1),
-            options=(('grpc.so_reuseport', 0),))
+        server = test_common.test_server()
         server.start()
         server.__del__()
         while server._state.stage != grpc._server._ServerStage.STOPPED:
diff --git a/src/python/grpcio_tests/tests/unit/_server_shutdown_test.py b/src/python/grpcio_tests/tests/unit/_server_shutdown_test.py
index 0e4591c5e5..47446d65a5 100644
--- a/src/python/grpcio_tests/tests/unit/_server_shutdown_test.py
+++ b/src/python/grpcio_tests/tests/unit/_server_shutdown_test.py
@@ -60,6 +60,8 @@ def wait(process):
 
 class ServerShutdown(unittest.TestCase):
 
+    # Currently we shut down a server (if possible) after the Python server
+    # instance is garbage collected. This behavior may change in the future.
     def test_deallocated_server_stops(self):
         process = subprocess.Popen(
             BASE_COMMAND + [_server_shutdown_scenarios.SERVER_DEALLOCATED],