diff options
| author |  Yang Gao <yangg@google.com> | 2015-02-26 09:30:36 -0800 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2015-02-26 09:30:36 -0800 |
| commit | 0e32857bfdab7422b22508fac833d7c651470691 (patch) | |
| tree | 3bc397d6f1bf3c47639900df482cb72876626809 /test/core/end2end/tests/simple_request.c | |
| parent | c33731aea655720293576e77ec4d5f04e1f7d545 (diff) | |
| parent | c1f1162787a84abdbc6cbe1717909692fad41261 (diff) | |
Merge pull request #784 from ctiller/timeout
Introduce slowdown factor for unit test deadlines
Diffstat (limited to 'test/core/end2end/tests/simple_request.c')
| -rw-r--r-- | test/core/end2end/tests/simple_request.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/core/end2end/tests/simple_request.c b/test/core/end2end/tests/simple_request.c index 5b36a19f3d..4d4d48a211 100644 --- a/test/core/end2end/tests/simple_request.c +++ b/test/core/end2end/tests/simple_request.c @@ -63,7 +63,7 @@ static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, } static gpr_timespec n_seconds_time(int n) { - return gpr_time_add(gpr_now(), gpr_time_from_micros(GPR_US_PER_SEC * n)); + return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); } static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } @@ -150,8 +150,7 @@ static void simple_request_body(grpc_end2end_test_fixture f) { GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call(f.server, &s, &call_details, &request_metadata_recv, - f.server_cq, - tag(101))); + f.server_cq, tag(101))); cq_expect_completion(v_server, tag(101), GRPC_OP_OK); cq_verify(v_server); |