commit d0e336ab587b60ba42b0a7e805ebceb2f711b031
author Nathaniel Manista <nathaniel@google.com> Tue Dec 13 11:59:30 2016 -0800
committer GitHub <noreply@github.com> Tue Dec 13 11:59:30 2016 -0800
tree da286ac8e5119e79b1da00c599f353f7460a6d4c
parent d0966d031dea95b2b282f6b82d0a7875dc173f0e
parent e1fd78f110d067c5091906664db05b7d80ee2991

Merge pull request #9045 from nathanielmanistaatgoogle/interop-fixes-v1.0.x

Interop fixes.

src/python/grpcio_tests/tests/interop/methods.py

diff --git a/src/python/grpcio_tests/tests/interop/methods.py b/src/python/grpcio_tests/tests/interop/methods.py
index 7edd75c..16afe4c 100644
--- a/src/python/grpcio_tests/tests/interop/methods.py
+++ b/src/python/grpcio_tests/tests/interop/methods.py
@@ -33,7 +33,6 @@
 import json
 import os
 import threading
-import time
 
 from oauth2client import client as oauth2client_client
 
@@ -159,16 +158,6 @@
       raise ValueError(
           'response body of invalid size %d!' % len(response.payload.body))
 
-def _cancel_after_begin(stub):
-  sizes = (27182, 8, 1828, 45904,)
-  payloads = (messages_pb2.Payload(body=b'\x00' * size) for size in sizes)
-  requests = (messages_pb2.StreamingInputCallRequest(payload=payload)
-              for payload in payloads)
-  response_future = stub.StreamingInputCall.future(requests)
-  response_future.cancel()
-  if not response_future.cancelled():
-    raise ValueError('expected call to be cancelled')
-
 
 class _Pipe(object):
 
@@ -232,6 +221,16 @@
             'response body of invalid size %d!' % len(response.payload.body))
 
 
+def _cancel_after_begin(stub):
+  with _Pipe() as pipe:
+    response_future = stub.StreamingInputCall.future(pipe)
+    response_future.cancel()
+    if not response_future.cancelled():
+      raise ValueError('expected cancelled method to return True')
+    if response_future.code() is not grpc.StatusCode.CANCELLED:
+      raise ValueError('expected status code CANCELLED')
+
+
 def _cancel_after_first_response(stub):
   request_response_sizes = (31415, 9, 2653, 58979,)
   request_payload_sizes = (27182, 8, 1828, 45904,)
@@ -269,7 +268,6 @@
         response_type=messages_pb2.COMPRESSABLE,
         payload=messages_pb2.Payload(body=b'\x00' * request_payload_size))
     pipe.add(request)
-    time.sleep(0.1)
     try:
       next(response_iterator)
     except grpc.RpcError as rpc_error: