aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/cpp
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-01-16 09:53:39 -0800
committerGravatar Craig Tiller <ctiller@google.com>2015-01-16 09:53:39 -0800
commit7b01878736840395f13244bd68edaf0d88b4c3e4 (patch)
tree62157ae945af04cef92bfd50106552ad8d78a491 /test/cpp
parent19cdb35a2cb229dbf14f0163f090c11427a8f797 (diff)
Fix returned status
The client should return status deadline exceeded when the deadline is exceeded (not cancelled status)
Diffstat (limited to 'test/cpp')
-rw-r--r--test/cpp/end2end/end2end_test.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc
index 3a1da68e47..4dea77ea81 100644
--- a/test/cpp/end2end/end2end_test.cc
+++ b/test/cpp/end2end/end2end_test.cc
@@ -210,9 +210,7 @@ TEST_F(End2endTest, RpcDeadlineExpires) {
std::chrono::system_clock::now() + std::chrono::microseconds(10);
context.set_absolute_deadline(deadline);
Status s = stub_->Echo(&context, request, &response);
- // TODO(yangg) use correct error code when b/18793983 is fixed.
- // EXPECT_EQ(StatusCode::DEADLINE_EXCEEDED, s.code());
- EXPECT_EQ(StatusCode::CANCELLED, s.code());
+ EXPECT_EQ(StatusCode::DEADLINE_EXCEEDED, s.code());
}
// Set a long but finite deadline.