Merge pull request #5523 from vjpai/e2e_stc

Fix ServerTryCancel in end2end tests
9 years ago · e788e8bf8d
parent 2a04f63d59 6c016efa34
commit e788e8bf8d
1 changed files with 5 additions and 1 deletions
--- a/test/cpp/end2end/test_service_impl.cc
+++ b/test/cpp/end2end/test_service_impl.cc
@ -326,7 +326,11 @@ void TestServiceImpl::ServerTryCancel(ServerContext* context) {
  EXPECT_FALSE(context->IsCancelled());
  context->TryCancel();
  gpr_log(GPR_INFO, "Server called TryCancel() to cancel the request");
-  EXPECT_TRUE(context->IsCancelled());
+  // Now wait until it's really canceled
+  while (!context->IsCancelled()) {
+    gpr_sleep_until(gpr_time_add(gpr_now(GPR_CLOCK_REALTIME),
+                                 gpr_time_from_micros(1000, GPR_TIMESPAN)));
+  }
 }

 }  // namespace testing