From 18298a74401c8ba87bd60cb8aa609eb380a84a1f Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhikumar@google.com>
Date: Fri, 17 Apr 2015 15:00:25 -0700
Subject: Fixed flakes due to OK racing with cancel

---
 test/cpp/end2end/end2end_test.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3