diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 7f47f30933c..a072fdd17d0 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -606,81 +606,6 @@ class CLanguage(object): return self.lang_suffix -# This tests Node on grpc/grpc-node and will become the standard for Node testing -class RemoteNodeLanguage(object): - def __init__(self): - self.platform = platform_string() - - def configure(self, config, args): - self.config = config - self.args = args - # Note: electron ABI only depends on major and minor version, so that's all - # we should specify in the compiler argument - _check_compiler( - self.args.compiler, - [ - "default", - "node0.12", - "node4", - "node5", - "node6", - "node7", - "node8", - "electron1.3", - "electron1.6", - ], - ) - if self.args.compiler == "default": - self.runtime = "node" - self.node_version = "8" - else: - if self.args.compiler.startswith("electron"): - self.runtime = "electron" - self.node_version = self.args.compiler[8:] - else: - self.runtime = "node" - # Take off the word "node" - self.node_version = self.args.compiler[4:] - - # TODO: update with Windows/electron scripts when available for grpc/grpc-node - def test_specs(self): - if self.platform == "windows": - return [ - self.config.job_spec( - ["tools\\run_tests\\helper_scripts\\run_node.bat"] - ) - ] - else: - return [ - self.config.job_spec( - ["tools/run_tests/helper_scripts/run_grpc-node.sh"], - None, - environ=_FORCE_ENVIRON_FOR_WRAPPERS, - ) - ] - - def pre_build_steps(self): - return [] - - def build_steps(self): - return [] - - def build_steps_environ(self): - """Extra environment variables set for pre_build_steps and build_steps jobs.""" - return {} - - def post_tests_steps(self): - return [] - - def dockerfile_dir(self): - return "tools/dockerfile/test/node_jessie_%s" % _docker_arch_suffix( - self.args.arch - ) - - def __str__(self): - return "grpc-node" - - class Php7Language(object): def configure(self, config, args): self.config = config @@ -1327,7 +1252,6 @@ with open("tools/run_tests/generated/configs.json") as f: _LANGUAGES = { "c++": CLanguage("cxx", "c++"), "c": CLanguage("c", "c"), - "grpc-node": RemoteNodeLanguage(), "php7": Php7Language(), "python": PythonLanguage(), "ruby": RubyLanguage(), @@ -1756,8 +1680,6 @@ argp.add_argument( "pypy3", "python_alpine", "all_the_cpythons", - "electron1.3", - "electron1.6", "coreclr", "cmake", "cmake_ninja_vs2019",