diff options
author | Craig Tiller <ctiller@google.com> | 2016-07-13 13:46:05 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2016-07-13 13:46:05 -0700 |
commit | d4c5bd8512fa5273e24f712343be6b97c0004bfe (patch) | |
tree | 759deb34b0458ceb5e81a0db958e09d651f7151e /src/python/grpcio_tests/tests/unit/_cython/cygrpc_test.py | |
parent | 6ca5437b61fe32cbf2636ca436a8585ff66d574c (diff) | |
parent | 7a70bb5486c199fb32742b2f1617e8206846cf65 (diff) |
Merge github.com:grpc/grpc into delayed-write
Diffstat (limited to 'src/python/grpcio_tests/tests/unit/_cython/cygrpc_test.py')
-rw-r--r-- | src/python/grpcio_tests/tests/unit/_cython/cygrpc_test.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/python/grpcio_tests/tests/unit/_cython/cygrpc_test.py b/src/python/grpcio_tests/tests/unit/_cython/cygrpc_test.py index 9d1dbc189b..f9a8e2401b 100644 --- a/src/python/grpcio_tests/tests/unit/_cython/cygrpc_test.py +++ b/src/python/grpcio_tests/tests/unit/_cython/cygrpc_test.py @@ -281,8 +281,8 @@ class ServerClientMixin(object): ], server_call_tag) self.assertEqual(cygrpc.CallError.ok, server_start_batch_result) - client_event = client_event_future.result() server_event = self.server_completion_queue.poll(cygrpc_deadline) + client_event = client_event_future.result() self.assertEqual(6, len(client_event.batch_operations)) found_client_op_types = set() |