diff options
| author |  Yuchen Zeng <zyc@google.com> | 2017-10-15 19:00:16 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2017-10-30 12:06:52 -0700 |
| commit | 7fa814fbeb9599d9d921a705438d254cc1920781 (patch) | |
| tree | 677e85c0198a1609bf9f0f18e8531ffa5dc6179b /test/cpp/end2end/end2end_test.cc | |
| parent | 6f9985e5513c40242afb74301a96f78bc790c2a1 (diff) | |
Fix timeouts
Diffstat (limited to 'test/cpp/end2end/end2end_test.cc')
| -rw-r--r-- | test/cpp/end2end/end2end_test.cc | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index 73f5555539..2272c9945e 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -30,11 +30,13 @@ #include <grpc++/server_builder.h> #include <grpc++/server_context.h> #include <grpc/grpc.h> +#include <grpc/support/alloc.h> #include <grpc/support/log.h> #include <grpc/support/thd.h> #include <grpc/support/time.h> #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/support/env.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" @@ -704,6 +706,14 @@ TEST_P(End2endTest, ReconnectChannel) { if (GetParam().inproc) { return; } + int poller_slowdown_factor = 1; + // It needs 2 pollset_works to reconnect the channel with polling engine + // "poll" + char* s = gpr_getenv("GRPC_POLL_STRATEGY"); + if (s != NULL && 0 == strcmp(s, "poll")) { + poller_slowdown_factor = 2; + } + gpr_free(s); ResetStub(); SendRpc(stub_.get(), 1, false); RestartServer(std::shared_ptr<AuthMetadataProcessor>()); @@ -711,7 +721,9 @@ TEST_P(End2endTest, ReconnectChannel) { // channel. gpr_sleep_until(gpr_time_add( gpr_now(GPR_CLOCK_REALTIME), - gpr_time_from_millis(600 * grpc_test_slowdown_factor(), GPR_TIMESPAN))); + gpr_time_from_millis( + 600 * poller_slowdown_factor * grpc_test_slowdown_factor(), + GPR_TIMESPAN))); SendRpc(stub_.get(), 1, false); } |