commit 690e010ef37775a0d754224e3cc47860ff41032a
author Tim Emiola <tbetbetbe@users.noreply.github.com> Wed Aug 19 15:36:09 2015 -0700
committer Tim Emiola <tbetbetbe@users.noreply.github.com> Wed Aug 19 15:36:09 2015 -0700
tree 0ebb92bda8740ab09bc19aafce21be0997d66d9b
parent e710e2bb999bcbfb6fd9a9866d1380d74840077b
parent c0c9ba9e429cb6aac2653f16cf171bf0c64920c8

Merge pull request #2984 from stanley-cheung/php_fix_timeout_test

php: fix timeout interop test

src/php/ext/grpc/call.c

diff --git a/src/php/ext/grpc/call.c b/src/php/ext/grpc/call.c
index 4e40dc4..6009a8d 100644
--- a/src/php/ext/grpc/call.c
+++ b/src/php/ext/grpc/call.c
@@ -273,7 +273,6 @@
   grpc_byte_buffer *message;
   int cancelled;
   grpc_call_error error;
-  grpc_event event;
   zval *result;
   char *message_str;
   size_t message_len;
@@ -409,14 +408,8 @@
                          (long)error TSRMLS_CC);
     goto cleanup;
   }
-  event = grpc_completion_queue_pluck(completion_queue, call->wrapped,
-                                      gpr_inf_future(GPR_CLOCK_REALTIME), NULL);
-  if (!event.success) {
-    zend_throw_exception(spl_ce_LogicException,
-                         "The batch failed for some reason",
-                         1 TSRMLS_CC);
-    goto cleanup;
-  }
+  grpc_completion_queue_pluck(completion_queue, call->wrapped,
+                              gpr_inf_future(GPR_CLOCK_REALTIME), NULL);
   for (int i = 0; i < op_num; i++) {
     switch(ops[i].op) {
       case GRPC_OP_SEND_INITIAL_METADATA:

src/php/tests/interop/interop_client.php

diff --git a/src/php/tests/interop/interop_client.php b/src/php/tests/interop/interop_client.php
index 44e6242..376d306 100755
--- a/src/php/tests/interop/interop_client.php
+++ b/src/php/tests/interop/interop_client.php
@@ -271,7 +271,7 @@
 }
 
 function timeoutOnSleepingServer($stub) {
-  $call = $stub->FullDuplexCall(array('timeout' => 500000));
+  $call = $stub->FullDuplexCall(array('timeout' => 1000));
   $request = new grpc\testing\StreamingOutputCallRequest();
   $request->setResponseType(grpc\testing\PayloadType::COMPRESSABLE);
   $response_parameters = new grpc\testing\ResponseParameters();