diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | build.yaml | 1 | ||||
| -rw-r--r-- | test/core/client_config/lb_policies_test.c | 6 | ||||
| -rw-r--r-- | tools/run_tests/tests.json | 12 |
4 files changed, 6 insertions, 15 deletions
@@ -3374,8 +3374,6 @@ flaky_test_cxx: buildtests_cxx ifeq ($(HAS_ZOOKEEPER),true) test_zookeeper: buildtests_zookeeper - $(E) "[RUN] Testing zookeeper_test" - $(Q) $(BINDIR)/$(CONFIG)/zookeeper_test || ( echo test zookeeper_test failed ; exit 1 ) flaky_test_zookeeper: buildtests_zookeeper diff --git a/build.yaml b/build.yaml index 527b7d5944..7ab70485c5 100644 --- a/build.yaml +++ b/build.yaml @@ -1003,6 +1003,7 @@ targets: deps: [grpc++_test_util, grpc_test_util, grpc++, grpc, gpr_test_util, gpr] - name: zookeeper_test build: test + run: false language: c++ src: [test/cpp/end2end/zookeeper_test.cc] deps: [grpc++_test_util, grpc_test_util, grpc++, grpc_zookeeper, grpc, gpr_test_util, diff --git a/test/core/client_config/lb_policies_test.c b/test/core/client_config/lb_policies_test.c index cbf4d03184..4e3b01d177 100644 --- a/test/core/client_config/lb_policies_test.c +++ b/test/core/client_config/lb_policies_test.c @@ -616,6 +616,8 @@ static void verify_rebirth_round_robin(const servers_fixture *f, expected_connection_sequence = gpr_malloc(sizeof(int) * expected_seq_length); seen_elements = gpr_malloc(sizeof(int) * expected_seq_length); + unique_seq_last_idx = ~(size_t)0; + memset(seen_elements, 0, sizeof(uint8_t) * expected_seq_length); for (i = 0; i < num_iters; i++) { if (actual_connection_sequence[i] < 0 || @@ -635,9 +637,11 @@ static void verify_rebirth_round_robin(const servers_fixture *f, } /* make sure we found a valid run */ for (j = 0; j < expected_seq_length; j++) { - GPR_ASSERT (seen_elements[j] != 0); + GPR_ASSERT(seen_elements[j] != 0); } + GPR_ASSERT(unique_seq_last_idx != ~(size_t)0); + unique_seq_first_idx = (unique_seq_last_idx - expected_seq_length + 1); memcpy(expected_connection_sequence, actual_connection_sequence + unique_seq_first_idx, diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index df251a2b8e..ebdd52f0af 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -1649,18 +1649,6 @@ }, { "ci_platforms": [ - "linux" - ], - "exclude_configs": [], - "flaky": false, - "language": "c++", - "name": "zookeeper_test", - "platforms": [ - "linux" - ] - }, - { - "ci_platforms": [ "linux", "mac", "posix", |