aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Tattermusch <jtattermusch@users.noreply.github.com>2018-01-31 08:55:00 +0100
committerGitHub <noreply@github.com>2018-01-31 08:55:00 +0100
commit306503861733e0210e25d4bb31907914f9d5b24e (patch)
tree1b750c38a3532c2f9d86d0ea7a3cb26d40ab4551
parent64637bf4a277916ebd92d3999af1eb7757ac42bc (diff)
parenta3088a6ce8f3b90c4445867f9924020fb02706be (diff)
downloadgrpc-grpc-306503861733e0210e25d4bb31907914f9d5b24e.tar.gz
Merge pull request #14238 from jtattermusch/echo_deadline_off_by_two
Fix rounding problem in EchoDeadline test
-rw-r--r--test/cpp/end2end/end2end_test.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc
index 2edd10898c..578f26e9c2 100644
--- a/test/cpp/end2end/end2end_test.cc
+++ b/test/cpp/end2end/end2end_test.cc
@@ -1333,8 +1333,11 @@ TEST_P(ProxyEnd2endTest, EchoDeadline) {
EXPECT_TRUE(s.ok());
gpr_timespec sent_deadline;
Timepoint2Timespec(deadline, &sent_deadline);
- // Allow 1 second error.
- EXPECT_LE(response.param().request_deadline() - sent_deadline.tv_sec, 1);
+ // We want to allow some reasonable error given:
+ // - request_deadline() only has 1sec resolution so the best we can do is +-1
+ // - if sent_deadline.tv_nsec is very close to the next second's boundary we
+ // can end up being off by 2 in one direction.
+ EXPECT_LE(response.param().request_deadline() - sent_deadline.tv_sec, 2);
EXPECT_GE(response.param().request_deadline() - sent_deadline.tv_sec, -1);
}