diff options
| author |  David G. Quintas <dgq@google.com> | 2015-09-24 09:54:58 -0700 |
|---|---|---|
| committer | David G. Quintas <dgq@google.com> | 2015-09-24 09:54:58 -0700 |
| commit | 40a595135dc962f7f9c32d841b5829f9152f6b16 (patch) | |
| tree | 6d4aeef89258568694f7181459e1955da598cbfe | |
| parent | fb41adcdd4cd57ec2409321be82740f49caafef5 (diff) | |
| parent | 7bedba8c45e996aaa1718b02457a644219ff7ea0 (diff) | |
Merge pull request #3456 from ctiller/no-animals
Disable zookeeper test for now
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | build.yaml | 1 | ||||
| -rw-r--r-- | tools/run_tests/tests.json | 12 |
3 files changed, 1 insertions, 14 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/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", |