Merge pull request #15689 from nathanielmanistaatgoogle/generic-rpc-handler-validation

Check conformance to grpc.GenericRpcHandler type.

2 files changed, 53 insertions, 0 deletions

diff --git a/src/python/grpcio_tests/tests/tests.json b/src/python/grpcio_tests/tests/tests.json
index 65460a9540..ebc41c63f0 100644
--- a/src/python/grpcio_tests/tests/tests.json
+++ b/src/python/grpcio_tests/tests/tests.json
@@ -53,6 +53,7 @@
   "unit._server_ssl_cert_config_test.ServerSSLCertReloadTestCertConfigReuse",
   "unit._server_ssl_cert_config_test.ServerSSLCertReloadTestWithClientAuth",
   "unit._server_ssl_cert_config_test.ServerSSLCertReloadTestWithoutClientAuth",
+  "unit._server_test.ServerTest",
   "unit._session_cache_test.SSLSessionCacheTest",
   "unit.beta._beta_features_test.BetaFeaturesTest",
   "unit.beta._beta_features_test.ContextManagementAndLifecycleTest",
diff --git a/src/python/grpcio_tests/tests/unit/_server_test.py b/src/python/grpcio_tests/tests/unit/_server_test.py
new file mode 100644
index 0000000000..acf4a17921
--- /dev/null
+++ b/src/python/grpcio_tests/tests/unit/_server_test.py
@@ -0,0 +1,52 @@
+# Copyright 2018 The gRPC Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from concurrent import futures
+import unittest
+
+import grpc
+
+
+class _ActualGenericRpcHandler(grpc.GenericRpcHandler):
+
+    def service(self, handler_call_details):
+        return None
+
+
+class ServerTest(unittest.TestCase):
+
+    def test_not_a_generic_rpc_handler_at_construction(self):
+        with self.assertRaises(AttributeError) as exception_context:
+            grpc.server(
+                futures.ThreadPoolExecutor(max_workers=5),
+                handlers=[
+                    _ActualGenericRpcHandler(),
+                    object(),
+                ])
+        self.assertIn('grpc.GenericRpcHandler',
+                      str(exception_context.exception))
+
+    def test_not_a_generic_rpc_handler_after_construction(self):
+        server = grpc.server(futures.ThreadPoolExecutor(max_workers=5))
+        with self.assertRaises(AttributeError) as exception_context:
+            server.add_generic_rpc_handlers([
+                _ActualGenericRpcHandler(),
+                object(),
+            ])
+        self.assertIn('grpc.GenericRpcHandler',
+                      str(exception_context.exception))
+
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)