From b23f4b7db947a558971cc58d663c21ad7e9e38ee Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 31 Jan 2017 15:50:45 -0800 Subject: [PATCH] Mark hybrid tests as flaky --- Makefile | 4 ++-- build.yaml | 2 +- tools/run_tests/generated/tests.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 08aa4fae827..77772d1caef 100644 --- a/Makefile +++ b/Makefile @@ -1894,8 +1894,6 @@ test_cxx: buildtests_cxx $(Q) $(BINDIR)/$(CONFIG)/grpclb_api_test || ( echo test grpclb_api_test failed ; exit 1 ) $(E) "[RUN] Testing grpclb_test" $(Q) $(BINDIR)/$(CONFIG)/grpclb_test || ( echo test grpclb_test failed ; exit 1 ) - $(E) "[RUN] Testing hybrid_end2end_test" - $(Q) $(BINDIR)/$(CONFIG)/hybrid_end2end_test || ( echo test hybrid_end2end_test failed ; exit 1 ) $(E) "[RUN] Testing interop_test" $(Q) $(BINDIR)/$(CONFIG)/interop_test || ( echo test interop_test failed ; exit 1 ) $(E) "[RUN] Testing mock_test" @@ -1931,6 +1929,8 @@ test_cxx: buildtests_cxx flaky_test_cxx: buildtests_cxx + $(E) "[RUN] Testing hybrid_end2end_test" + $(Q) $(BINDIR)/$(CONFIG)/hybrid_end2end_test || ( echo test hybrid_end2end_test failed ; exit 1 ) test_python: static_c diff --git a/build.yaml b/build.yaml index c35ce32b40e..56f09b8c2d2 100644 --- a/build.yaml +++ b/build.yaml @@ -3287,7 +3287,7 @@ targets: - linux - posix - name: hybrid_end2end_test - gtest: true + flaky: true build: test language: c++ src: diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 13c6318d52a..f42547c5e89 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -2856,8 +2856,8 @@ "cpu_cost": 1.0, "exclude_configs": [], "exclude_iomgrs": [], - "flaky": false, - "gtest": true, + "flaky": true, + "gtest": false, "language": "c++", "name": "hybrid_end2end_test", "platforms": [