diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-02-01 09:19:09 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-02-01 09:19:09 -0800 |
| commit | e55fcc7f060ec94c22b9b0e1865a327f24c20afd (patch) | |
| tree | e0fce1eb7132ef359c4a337ea6c818df8c5044a0 | |
| parent | 459e10d80e09a5c8e88dc10ff703358b5d3ee57b (diff) | |
| parent | b23f4b7db947a558971cc58d663c21ad7e9e38ee (diff) | |
Merge pull request #9530 from ctiller/hybrid
Mark hybrid tests as flaky
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | build.yaml | 2 | ||||
| -rw-r--r-- | tools/run_tests/generated/tests.json | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -1886,8 +1886,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" @@ -1923,6 +1921,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 5f6e0bbfdd..96f27679f4 100644 --- a/build.yaml +++ b/build.yaml @@ -3288,7 +3288,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 5c72bc96a5..fb7a72c4ff 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": [ |