diff options
| author |  Robbie Shade <rjshade@google.com> | 2017-01-17 09:14:29 -0500 |
|---|---|---|
| committer | Robbie Shade <rjshade@google.com> | 2017-01-31 15:40:20 -0500 |
| commit | ca7effcdff69baba8e52e4c83fe808491df60f36 (patch) | |
| tree | 7e04f13f655f44c5930233381b615e1d54e5386e /test/core/end2end/fixtures | |
| parent | c88834ba996084db5f530706a09892bdd900e7dc (diff) | |
Replace timeout/scaling macros with functions.
Diffstat (limited to 'test/core/end2end/fixtures')
| -rw-r--r-- | test/core/end2end/fixtures/h2_full+trace.c | 4 | ||||
| -rw-r--r-- | test/core/end2end/fixtures/h2_sockpair+trace.c | 4 | ||||
| -rw-r--r-- | test/core/end2end/fixtures/h2_sockpair_1byte.c | 2 | ||||
| -rw-r--r-- | test/core/end2end/fixtures/h2_ssl_cert.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/test/core/end2end/fixtures/h2_full+trace.c b/test/core/end2end/fixtures/h2_full+trace.c index 11a102a576..01316376e0 100644 --- a/test/core/end2end/fixtures/h2_full+trace.c +++ b/test/core/end2end/fixtures/h2_full+trace.c @@ -117,9 +117,9 @@ int main(int argc, char **argv) { gpr_setenv("GRPC_TRACE", "doesnt-exist,http,all"); #ifdef GRPC_POSIX_SOCKET - g_fixture_slowdown_factor = isatty(STDOUT_FILENO) ? 10.0 : 1.0; + g_fixture_slowdown_factor = isatty(STDOUT_FILENO) ? 10 : 1; #else - g_fixture_slowdown_factor = 10.0; + g_fixture_slowdown_factor = 10; #endif grpc_test_init(argc, argv); diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index 726ed8735c..edf42a4070 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -154,9 +154,9 @@ int main(int argc, char **argv) { code paths in trace.c to be taken */ gpr_setenv("GRPC_TRACE", "doesnt-exist,http,all"); #ifdef GRPC_POSIX_SOCKET - g_fixture_slowdown_factor = isatty(STDOUT_FILENO) ? 10.0 : 1.0; + g_fixture_slowdown_factor = isatty(STDOUT_FILENO) ? 10 : 1; #else - g_fixture_slowdown_factor = 10.0; + g_fixture_slowdown_factor = 10; #endif grpc_test_init(argc, argv); diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c index 11af7bee1e..6f9cf8fe26 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -144,7 +144,7 @@ static grpc_end2end_test_config configs[] = { int main(int argc, char **argv) { size_t i; - g_fixture_slowdown_factor = 2.0; + g_fixture_slowdown_factor = 2; grpc_test_init(argc, argv); grpc_end2end_tests_pre_init(); diff --git a/test/core/end2end/fixtures/h2_ssl_cert.c b/test/core/end2end/fixtures/h2_ssl_cert.c index 844e93396d..f62331eea3 100644 --- a/test/core/end2end/fixtures/h2_ssl_cert.c +++ b/test/core/end2end/fixtures/h2_ssl_cert.c @@ -275,7 +275,7 @@ static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, } static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); + return grpc_timeout_seconds_to_deadline(n); } static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } @@ -291,7 +291,7 @@ static void shutdown_server(grpc_end2end_test_fixture *f) { if (!f->server) return; grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + f->cq, tag(1000), grpc_timeout_seconds_to_deadline(5), NULL) .type == GRPC_OP_COMPLETE); grpc_server_destroy(f->server); f->server = NULL; |