diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-11-08 07:20:27 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-11-08 07:20:27 -0800 |
| commit | b720b609eaa7ad6ca009e55bf773ec32e9c68f6a (patch) | |
| tree | 555719efdc4bbe6b41a573b02a565c917e6e4e27 /src/python | |
| parent | 32df467f1189c2b1bc7010b0a99932a7a3fb2684 (diff) | |
| parent | 150fbe1e5f1b2a88c35b39480770eb1503692bed (diff) | |
Merge github.com:grpc/grpc into grpc_slice
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/grpcio/grpc_core_dependencies.py | 1 | ||||
| -rw-r--r-- | src/python/grpcio_tests/tests/unit/_rpc_test.py | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 1647d16a4b..b0041871d4 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -182,6 +182,7 @@ CORE_SOURCE_FILES = [ 'src/core/lib/transport/metadata.c', 'src/core/lib/transport/metadata_batch.c', 'src/core/lib/transport/method_config.c', + 'src/core/lib/transport/pid_controller.c', 'src/core/lib/transport/static_metadata.c', 'src/core/lib/transport/timeout_encoding.c', 'src/core/lib/transport/transport.c', diff --git a/src/python/grpcio_tests/tests/unit/_rpc_test.py b/src/python/grpcio_tests/tests/unit/_rpc_test.py index ab6546bf87..eb00156da5 100644 --- a/src/python/grpcio_tests/tests/unit/_rpc_test.py +++ b/src/python/grpcio_tests/tests/unit/_rpc_test.py @@ -191,6 +191,10 @@ class RPCTest(unittest.TestCase): self._channel = grpc.insecure_channel('localhost:%d' % port) + def tearDown(self): + self._server.stop(None) + self._server_pool.shutdown(wait=True) + def testUnrecognizedMethod(self): request = b'abc' |