From 9b4ef62cb95b74bfc23b7bec82ca25b59be48787 Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Sun, 26 Jul 2020 16:23:38 -0700 Subject: [PATCH] Split up run_ruby_end2end_tests.sh into more granular test targets --- src/ruby/.rubocop_todo.yml | 2 +- ...ata_doesnt_kill_background_thread_test.rb} | 0 ...er.rb => call_credentials_timeout_test.rb} | 0 ...sing_driver.rb => channel_closing_test.rb} | 0 ..._state_driver.rb => channel_state_test.rb} | 0 ..._driver.rb => client_memory_usage_test.rb} | 0 ...rb => errors_load_before_grpc_lib_test.rb} | 0 ...lient_driver.rb => forking_client_test.rb} | 0 ...river.rb => graceful_sig_handling_test.rb} | 0 ...op_driver.rb => graceful_sig_stop_test.rb} | 0 ...init_driver.rb => grpc_class_init_test.rb} | 0 ...driver.rb => killed_client_thread_test.rb} | 0 ...er.rb => load_grpc_with_gc_stress_test.rb} | 0 ...rb => logger_load_before_grpc_lib_test.rb} | 0 ... multiple_killed_watching_threads_test.rb} | 0 ...ker.rb => package_with_underscore_test.rb} | 0 ...andling_driver.rb => sig_handling_test.rb} | 0 ...b => sig_int_during_channel_watch_test.rb} | 0 ...status_codes_load_before_grpc_lib_test.rb} | 0 .../helper_scripts/run_ruby_end2end_tests.sh | 40 ------------------- tools/run_tests/run_tests.py | 30 +++++++++++--- 21 files changed, 26 insertions(+), 46 deletions(-) rename src/ruby/end2end/{call_credentials_returning_bad_metadata_doesnt_kill_background_thread_driver.rb => call_credentials_returning_bad_metadata_doesnt_kill_background_thread_test.rb} (100%) rename src/ruby/end2end/{call_credentials_timeout_driver.rb => call_credentials_timeout_test.rb} (100%) rename src/ruby/end2end/{channel_closing_driver.rb => channel_closing_test.rb} (100%) rename src/ruby/end2end/{channel_state_driver.rb => channel_state_test.rb} (100%) rename src/ruby/end2end/{client_memory_usage_driver.rb => client_memory_usage_test.rb} (100%) rename src/ruby/end2end/{errors_load_before_grpc_lib.rb => errors_load_before_grpc_lib_test.rb} (100%) rename src/ruby/end2end/{forking_client_driver.rb => forking_client_test.rb} (100%) rename src/ruby/end2end/{graceful_sig_handling_driver.rb => graceful_sig_handling_test.rb} (100%) rename src/ruby/end2end/{graceful_sig_stop_driver.rb => graceful_sig_stop_test.rb} (100%) rename src/ruby/end2end/{grpc_class_init_driver.rb => grpc_class_init_test.rb} (100%) rename src/ruby/end2end/{killed_client_thread_driver.rb => killed_client_thread_test.rb} (100%) rename src/ruby/end2end/{load_grpc_with_gc_stress_driver.rb => load_grpc_with_gc_stress_test.rb} (100%) rename src/ruby/end2end/{logger_load_before_grpc_lib.rb => logger_load_before_grpc_lib_test.rb} (100%) rename src/ruby/end2end/{multiple_killed_watching_threads_driver.rb => multiple_killed_watching_threads_test.rb} (100%) rename src/ruby/end2end/{package_with_underscore_checker.rb => package_with_underscore_test.rb} (100%) rename src/ruby/end2end/{sig_handling_driver.rb => sig_handling_test.rb} (100%) rename src/ruby/end2end/{sig_int_during_channel_watch_driver.rb => sig_int_during_channel_watch_test.rb} (100%) rename src/ruby/end2end/{status_codes_load_before_grpc_lib.rb => status_codes_load_before_grpc_lib_test.rb} (100%) delete mode 100755 tools/run_tests/helper_scripts/run_ruby_end2end_tests.sh diff --git a/src/ruby/.rubocop_todo.yml b/src/ruby/.rubocop_todo.yml index 32b84b8de0e..e2b5d92146b 100644 --- a/src/ruby/.rubocop_todo.yml +++ b/src/ruby/.rubocop_todo.yml @@ -449,7 +449,7 @@ Style/ParallelAssignment: # Configuration parameters: PreferredDelimiters. Style/PercentLiteralDelimiters: Exclude: - - 'end2end/grpc_class_init_driver.rb' + - 'end2end/grpc_class_init_test.rb' - 'spec/client_server_spec.rb' - 'spec/generic/active_call_spec.rb' - 'spec/generic/client_stub_spec.rb' diff --git a/src/ruby/end2end/call_credentials_returning_bad_metadata_doesnt_kill_background_thread_driver.rb b/src/ruby/end2end/call_credentials_returning_bad_metadata_doesnt_kill_background_thread_test.rb similarity index 100% rename from src/ruby/end2end/call_credentials_returning_bad_metadata_doesnt_kill_background_thread_driver.rb rename to src/ruby/end2end/call_credentials_returning_bad_metadata_doesnt_kill_background_thread_test.rb diff --git a/src/ruby/end2end/call_credentials_timeout_driver.rb b/src/ruby/end2end/call_credentials_timeout_test.rb similarity index 100% rename from src/ruby/end2end/call_credentials_timeout_driver.rb rename to src/ruby/end2end/call_credentials_timeout_test.rb diff --git a/src/ruby/end2end/channel_closing_driver.rb b/src/ruby/end2end/channel_closing_test.rb similarity index 100% rename from src/ruby/end2end/channel_closing_driver.rb rename to src/ruby/end2end/channel_closing_test.rb diff --git a/src/ruby/end2end/channel_state_driver.rb b/src/ruby/end2end/channel_state_test.rb similarity index 100% rename from src/ruby/end2end/channel_state_driver.rb rename to src/ruby/end2end/channel_state_test.rb diff --git a/src/ruby/end2end/client_memory_usage_driver.rb b/src/ruby/end2end/client_memory_usage_test.rb similarity index 100% rename from src/ruby/end2end/client_memory_usage_driver.rb rename to src/ruby/end2end/client_memory_usage_test.rb diff --git a/src/ruby/end2end/errors_load_before_grpc_lib.rb b/src/ruby/end2end/errors_load_before_grpc_lib_test.rb similarity index 100% rename from src/ruby/end2end/errors_load_before_grpc_lib.rb rename to src/ruby/end2end/errors_load_before_grpc_lib_test.rb diff --git a/src/ruby/end2end/forking_client_driver.rb b/src/ruby/end2end/forking_client_test.rb similarity index 100% rename from src/ruby/end2end/forking_client_driver.rb rename to src/ruby/end2end/forking_client_test.rb diff --git a/src/ruby/end2end/graceful_sig_handling_driver.rb b/src/ruby/end2end/graceful_sig_handling_test.rb similarity index 100% rename from src/ruby/end2end/graceful_sig_handling_driver.rb rename to src/ruby/end2end/graceful_sig_handling_test.rb diff --git a/src/ruby/end2end/graceful_sig_stop_driver.rb b/src/ruby/end2end/graceful_sig_stop_test.rb similarity index 100% rename from src/ruby/end2end/graceful_sig_stop_driver.rb rename to src/ruby/end2end/graceful_sig_stop_test.rb diff --git a/src/ruby/end2end/grpc_class_init_driver.rb b/src/ruby/end2end/grpc_class_init_test.rb similarity index 100% rename from src/ruby/end2end/grpc_class_init_driver.rb rename to src/ruby/end2end/grpc_class_init_test.rb diff --git a/src/ruby/end2end/killed_client_thread_driver.rb b/src/ruby/end2end/killed_client_thread_test.rb similarity index 100% rename from src/ruby/end2end/killed_client_thread_driver.rb rename to src/ruby/end2end/killed_client_thread_test.rb diff --git a/src/ruby/end2end/load_grpc_with_gc_stress_driver.rb b/src/ruby/end2end/load_grpc_with_gc_stress_test.rb similarity index 100% rename from src/ruby/end2end/load_grpc_with_gc_stress_driver.rb rename to src/ruby/end2end/load_grpc_with_gc_stress_test.rb diff --git a/src/ruby/end2end/logger_load_before_grpc_lib.rb b/src/ruby/end2end/logger_load_before_grpc_lib_test.rb similarity index 100% rename from src/ruby/end2end/logger_load_before_grpc_lib.rb rename to src/ruby/end2end/logger_load_before_grpc_lib_test.rb diff --git a/src/ruby/end2end/multiple_killed_watching_threads_driver.rb b/src/ruby/end2end/multiple_killed_watching_threads_test.rb similarity index 100% rename from src/ruby/end2end/multiple_killed_watching_threads_driver.rb rename to src/ruby/end2end/multiple_killed_watching_threads_test.rb diff --git a/src/ruby/end2end/package_with_underscore_checker.rb b/src/ruby/end2end/package_with_underscore_test.rb similarity index 100% rename from src/ruby/end2end/package_with_underscore_checker.rb rename to src/ruby/end2end/package_with_underscore_test.rb diff --git a/src/ruby/end2end/sig_handling_driver.rb b/src/ruby/end2end/sig_handling_test.rb similarity index 100% rename from src/ruby/end2end/sig_handling_driver.rb rename to src/ruby/end2end/sig_handling_test.rb diff --git a/src/ruby/end2end/sig_int_during_channel_watch_driver.rb b/src/ruby/end2end/sig_int_during_channel_watch_test.rb similarity index 100% rename from src/ruby/end2end/sig_int_during_channel_watch_driver.rb rename to src/ruby/end2end/sig_int_during_channel_watch_test.rb diff --git a/src/ruby/end2end/status_codes_load_before_grpc_lib.rb b/src/ruby/end2end/status_codes_load_before_grpc_lib_test.rb similarity index 100% rename from src/ruby/end2end/status_codes_load_before_grpc_lib.rb rename to src/ruby/end2end/status_codes_load_before_grpc_lib_test.rb diff --git a/tools/run_tests/helper_scripts/run_ruby_end2end_tests.sh b/tools/run_tests/helper_scripts/run_ruby_end2end_tests.sh deleted file mode 100755 index fe552ce318e..00000000000 --- a/tools/run_tests/helper_scripts/run_ruby_end2end_tests.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -# Copyright 2015 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -ex - -# change to grpc repo root -cd "$(dirname "$0")/../../.." - -EXIT_CODE=0 -time ruby src/ruby/end2end/sig_handling_driver.rb || EXIT_CODE=1 -time ruby src/ruby/end2end/channel_state_driver.rb || EXIT_CODE=1 -time ruby src/ruby/end2end/channel_closing_driver.rb || EXIT_CODE=1 -time ruby src/ruby/end2end/sig_int_during_channel_watch_driver.rb || EXIT_CODE=1 -time ruby src/ruby/end2end/killed_client_thread_driver.rb || EXIT_CODE=1 -time ruby src/ruby/end2end/forking_client_driver.rb || EXIT_CODE=1 -time ruby src/ruby/end2end/grpc_class_init_driver.rb || EXIT_CODE=1 -time ruby src/ruby/end2end/multiple_killed_watching_threads_driver.rb || EXIT_CODE=1 -time ruby src/ruby/end2end/load_grpc_with_gc_stress_driver.rb || EXIT_CODE=1 -time ruby src/ruby/end2end/client_memory_usage_driver.rb || EXIT_CODE=1 -time ruby src/ruby/end2end/package_with_underscore_checker.rb || EXIT_CODE=1 -time ruby src/ruby/end2end/graceful_sig_handling_driver.rb || EXIT_CODE=1 -time ruby src/ruby/end2end/graceful_sig_stop_driver.rb || EXIT_CODE=1 -time ruby src/ruby/end2end/errors_load_before_grpc_lib.rb || EXIT_CODE=1 -time ruby src/ruby/end2end/logger_load_before_grpc_lib.rb || EXIT_CODE=1 -time ruby src/ruby/end2end/status_codes_load_before_grpc_lib.rb || EXIT_CODE=1 -time ruby src/ruby/end2end/call_credentials_timeout_driver.rb || EXIT_CODE=1 -time ruby src/ruby/end2end/call_credentials_returning_bad_metadata_doesnt_kill_background_thread_driver.rb || EXIT_CODE=1 -exit $EXIT_CODE diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 38286345aac..c0cf4733bee 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -926,11 +926,31 @@ class RubyLanguage(object): timeout_seconds=10 * 60, environ=_FORCE_ENVIRON_FOR_WRAPPERS) ] - tests.append( - self.config.job_spec( - ['tools/run_tests/helper_scripts/run_ruby_end2end_tests.sh'], - timeout_seconds=20 * 60, - environ=_FORCE_ENVIRON_FOR_WRAPPERS)) + for test in [ + 'src/ruby/end2end/sig_handling_test.rb', + 'src/ruby/end2end/channel_state_test.rb', + 'src/ruby/end2end/channel_closing_test.rb', + 'src/ruby/end2end/sig_int_during_channel_watch_test.rb', + 'src/ruby/end2end/killed_client_thread_test.rb', + 'src/ruby/end2end/forking_client_test.rb', + 'src/ruby/end2end/grpc_class_init_test.rb', + 'src/ruby/end2end/multiple_killed_watching_threads_test.rb', + 'src/ruby/end2end/load_grpc_with_gc_stress_test.rb', + 'src/ruby/end2end/client_memory_usage_test.rb', + 'src/ruby/end2end/package_with_underscore_test.rb', + 'src/ruby/end2end/graceful_sig_handling_test.rb', + 'src/ruby/end2end/graceful_sig_stop_test.rb', + 'src/ruby/end2end/errors_load_before_grpc_lib_test.rb', + 'src/ruby/end2end/logger_load_before_grpc_lib_test.rb', + 'src/ruby/end2end/status_codes_load_before_grpc_lib_test.rb', + 'src/ruby/end2end/call_credentials_timeout_test.rb', + 'src/ruby/end2end/call_credentials_returning_bad_metadata_doesnt_kill_background_thread_test.rb' + ]: + tests.append( + self.config.job_spec(['ruby', test], + shortname=test, + timeout_seconds=20 * 60, + environ=_FORCE_ENVIRON_FOR_WRAPPERS)) return tests def pre_build_steps(self):