diff options
| author |  Makarand Dharmapurikar <makarandd@google.com> | 2017-03-27 09:18:21 -0700 |
|---|---|---|
| committer | Makarand Dharmapurikar <makarandd@google.com> | 2017-03-27 09:18:21 -0700 |
| commit | a0649dde0ec92624d56f943d3b0fae09bcb65e5b (patch) | |
| tree | 8b0885a3e6d7584b79b5a31725932f4c606768a1 /src/python/grpcio_tests/tests/interop/_secure_intraop_test.py | |
| parent | 3c7e460de68625c926b8e4581ed573e543a16a67 (diff) | |
| parent | c4478a103b68100b86f506061cedcb0ce70016ba (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into grpcz_client
Diffstat (limited to 'src/python/grpcio_tests/tests/interop/_secure_intraop_test.py')
| -rw-r--r-- | src/python/grpcio_tests/tests/interop/_secure_intraop_test.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/python/grpcio_tests/tests/interop/_secure_intraop_test.py b/src/python/grpcio_tests/tests/interop/_secure_intraop_test.py index 5fe929b99e..857e00efb3 100644 --- a/src/python/grpcio_tests/tests/interop/_secure_intraop_test.py +++ b/src/python/grpcio_tests/tests/interop/_secure_intraop_test.py @@ -32,7 +32,7 @@ from concurrent import futures import unittest import grpc -from src.proto.grpc.testing import test_pb2 +from src.proto.grpc.testing import test_pb2_grpc from tests.interop import _intraop_test_case from tests.interop import methods @@ -45,14 +45,14 @@ class SecureIntraopTest(_intraop_test_case.IntraopTestCase, unittest.TestCase): def setUp(self): self.server = grpc.server(futures.ThreadPoolExecutor(max_workers=10)) - test_pb2.add_TestServiceServicer_to_server(methods.TestService(), - self.server) + test_pb2_grpc.add_TestServiceServicer_to_server(methods.TestService(), + self.server) port = self.server.add_secure_port( '[::]:0', grpc.ssl_server_credentials( [(resources.private_key(), resources.certificate_chain())])) self.server.start() - self.stub = test_pb2.TestServiceStub( + self.stub = test_pb2_grpc.TestServiceStub( grpc.secure_channel('localhost:{}'.format(port), grpc.ssl_channel_credentials( resources.test_root_certificates()), ( |