aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Abhishek Kumar <abhikumar@google.com>2015-04-17 15:00:25 -0700
committerGravatar Abhishek Kumar <abhikumar@google.com>2015-04-17 15:00:25 -0700
commit18298a74401c8ba87bd60cb8aa609eb380a84a1f (patch)
tree244d59822842acaade4b56d20513ce2b796bcca9
parente41d0402ba727d5f89bdf39e90e406227cc23601 (diff)
Fixed flakes due to OK racing with cancel
-rw-r--r--test/cpp/end2end/end2end_test.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc
index 3193a2af58..505984008a 100644
--- a/test/cpp/end2end/end2end_test.cc
+++ b/test/cpp/end2end/end2end_test.cc
@@ -518,7 +518,9 @@ TEST_F(End2endTest, ServerCancelsRpc) {
}
Status s = stream->Finish();
- EXPECT_EQ(grpc::StatusCode::CANCELLED, s.code());
+ // The final status could be either of CANCELLED or OK depending on
+ // who won the race.
+ EXPECT_GE(grpc::StatusCode::CANCELLED, s.code());
}
// Client cancels bidi stream after sending some messages