diff --git a/Makefile b/Makefile index c4183914e6354c44f7e66e6d84ea1a3f83328f60..38d0adb796a865af217d7cac94a67b65735ddf4f 100644 --- a/Makefile +++ b/Makefile @@ -3560,8 +3560,6 @@ test_cxx: test_zookeeper buildtests_cxx $(Q) $(BINDIR)/$(CONFIG)/status_test || ( echo test status_test failed ; exit 1 ) $(E) "[RUN] Testing streaming_throughput_test" $(Q) $(BINDIR)/$(CONFIG)/streaming_throughput_test || ( echo test streaming_throughput_test failed ; exit 1 ) - $(E) "[RUN] Testing stress_test" - $(Q) $(BINDIR)/$(CONFIG)/stress_test || ( echo test stress_test failed ; exit 1 ) $(E) "[RUN] Testing sync_streaming_ping_pong_test" $(Q) $(BINDIR)/$(CONFIG)/sync_streaming_ping_pong_test || ( echo test sync_streaming_ping_pong_test failed ; exit 1 ) $(E) "[RUN] Testing sync_unary_ping_pong_test" diff --git a/build.yaml b/build.yaml index 4f6e35b0de1c25503687ce23db1e81f101d2ffe0..dadd9429e24a36deec059cc873a495bece460772 100644 --- a/build.yaml +++ b/build.yaml @@ -2107,6 +2107,7 @@ targets: - posix - name: stress_test build: test + run: false language: c++ headers: - test/cpp/interop/client_helper.h diff --git a/test/cpp/interop/stress_test.cc b/test/cpp/interop/stress_test.cc index 49f3fbcc14c57264e2ebd400e142156a0f4d68dc..5d1419728e4ca7d46ddc809a7d828a12e1f2860d 100644 --- a/test/cpp/interop/stress_test.cc +++ b/test/cpp/interop/stress_test.cc @@ -186,14 +186,7 @@ int main(int argc, char** argv) { // Parse test cases and weights if (FLAGS_test_cases.length() == 0) { gpr_log(GPR_INFO, "Not running tests. The 'test_cases' string is empty"); - - // TODO(sreek): stress_tests is currently being run by run_tests.py in - // jenkins. There does not seem to be a straightforward way to skip this. - // So, for now, return 0 (i.e success) to keep jenkins build happy. Moreover - // we don't want to run stress_tests (for now) in jenkins anyway. - // Once we figure out a good way to skip this tests in run_tests.py, I will - // change this to 'return 1' - return 0; + return 1; } vector<pair<TestCaseType, int>> tests; diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index b03e952c89329e6a07cdd727380e13a242d4cc9e..2f91844f441f66d8db9899ee13bf5520b2f35e7d 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -1617,24 +1617,6 @@ "posix" ] }, - { - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "exclude_configs": [], - "flaky": false, - "language": "c++", - "name": "stress_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, { "ci_platforms": [ "linux",