diff options
| author |  Mark D. Roth <roth@google.com> | 2018-04-03 14:55:42 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2018-04-03 14:55:42 -0700 |
| commit | eef0cf64167c04be35f6e85ef9855908846308cf (patch) | |
| tree | 7e961bfa4192014995d85c77f597d9227b0a7044 /src/python | |
| parent | 45afdedaa6122be29846226d1b5e1998f00a0510 (diff) | |
| parent | cb078e5558836e7e5fb6510a6f687e4e3eefa939 (diff) | |
Merge remote-tracking branch 'upstream/master' into c++_subchannel_list
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/grpcio_tests/commands.py | 2 | ||||
| -rw-r--r-- | src/python/grpcio_tests/tests/interop/_insecure_intraop_test.py | 3 | ||||
| -rw-r--r-- | src/python/grpcio_tests/tests/interop/_secure_intraop_test.py | 3 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/python/grpcio_tests/commands.py b/src/python/grpcio_tests/commands.py index d4dbcdc191..42e01c18d3 100644 --- a/src/python/grpcio_tests/commands.py +++ b/src/python/grpcio_tests/commands.py @@ -121,6 +121,8 @@ class TestGevent(setuptools.Command): 'testing._client_test.ClientTest.test_infinite_request_stream_real_time', # TODO(https://github.com/grpc/grpc/issues/14789) enable this test 'unit._server_ssl_cert_config_test', + # TODO(https://github.com/grpc/grpc/issues/14901) enable this test + 'protoc_plugin._python_plugin_test.PythonPluginTest', # Beta API is unsupported for gevent 'protoc_plugin.beta_python_plugin_test', 'unit.beta._beta_features_test', diff --git a/src/python/grpcio_tests/tests/interop/_insecure_intraop_test.py b/src/python/grpcio_tests/tests/interop/_insecure_intraop_test.py index 8d464b2d4b..ace15bea58 100644 --- a/src/python/grpcio_tests/tests/interop/_insecure_intraop_test.py +++ b/src/python/grpcio_tests/tests/interop/_insecure_intraop_test.py @@ -36,6 +36,9 @@ class InsecureIntraopTest(_intraop_test_case.IntraopTestCase, self.stub = test_pb2_grpc.TestServiceStub( grpc.insecure_channel('localhost:{}'.format(port))) + def tearDown(self): + self.server.stop(None) + if __name__ == '__main__': unittest.main(verbosity=2) 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 c89135998d..e27e551ecb 100644 --- a/src/python/grpcio_tests/tests/interop/_secure_intraop_test.py +++ b/src/python/grpcio_tests/tests/interop/_secure_intraop_test.py @@ -45,6 +45,9 @@ class SecureIntraopTest(_intraop_test_case.IntraopTestCase, unittest.TestCase): _SERVER_HOST_OVERRIDE, ),))) + def tearDown(self): + self.server.stop(None) + if __name__ == '__main__': unittest.main(verbosity=2) |