aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Yash Tibrewal <yashkt@google.com>2018-05-04 11:47:51 -0700
committerGravatar GitHub <noreply@github.com>2018-05-04 11:47:51 -0700
commit0b1d8cec815a3d6a48c90084260cece97e946119 (patch)
treef08466e8dbe5e9911fe7a51cd7275bf998cb1efa
parent4e85a3aaf725238640fd59fbdb450cdedd5e47f8 (diff)
parent7392f053217bf202841a416a15c57b1103bd7a42 (diff)
Merge pull request #15267 from yashykt/badpingfix
Fix bad_ping end2end test flakiness
-rw-r--r--test/core/end2end/tests/bad_ping.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/test/core/end2end/tests/bad_ping.cc b/test/core/end2end/tests/bad_ping.cc
index 22481d1be7..98d893f64d 100644
--- a/test/core/end2end/tests/bad_ping.cc
+++ b/test/core/end2end/tests/bad_ping.cc
@@ -355,6 +355,11 @@ static void test_pings_without_data(grpc_end2end_test_config config) {
grpc_server_shutdown_and_notify(f.server, f.cq, tag(0xdead));
CQ_EXPECT_COMPLETION(cqv, tag(0xdead), 1);
+
+ // Also expect the previously blocked pings to complete with an error
+ CQ_EXPECT_COMPLETION(cqv, tag(200 + MAX_PING_STRIKES + 1), 0);
+ CQ_EXPECT_COMPLETION(cqv, tag(200 + MAX_PING_STRIKES + 2), 0);
+
cq_verify(cqv);
grpc_call_unref(s);