diff --git a/test/cpp/interop/client.cc b/test/cpp/interop/client.cc index 38f357fb2427c..33662a77bb9f2 100644 --- a/test/cpp/interop/client.cc +++ b/test/cpp/interop/client.cc @@ -229,7 +229,9 @@ int main(int argc, char** argv) { new grpc::testing::MetadataAndStatusLoggerInterceptorFactory()); } if (test_case == "mcs_cs") { - arguments.SetServiceConfigJSON("{\"connection_scaling\":{\"max_connections_per_subchannel\": 2}}"); + arguments.SetServiceConfigJSON( + "{\"connection_scaling\":{\"max_connections_per_subchannel\": " + "2}}"); } else { std::string service_config_json = absl::GetFlag(FLAGS_service_config_json); diff --git a/tools/run_tests/python_utils/jobset.py b/tools/run_tests/python_utils/jobset.py index 3786d7a2d4e6c..521432e237a59 100755 --- a/tools/run_tests/python_utils/jobset.py +++ b/tools/run_tests/python_utils/jobset.py @@ -323,7 +323,7 @@ def start(self): cmdline = ["time", "-p"] + cmdline else: measure_cpu_costs = False - print('Starting subprocess for cmdline: ' + str(cmdline), True) + print("Starting subprocess for cmdline: " + str(cmdline), True) try_start = lambda: subprocess.Popen( args=cmdline, stderr=subprocess.STDOUT, diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index d582191bf5151..d5140253ca7d5 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -1135,7 +1135,11 @@ def cloud_to_cloud_jobspec( def server_jobspec( - language, docker_image, transport_security="tls", manual_cmd_log=None, use_mcs=False + language, + docker_image, + transport_security="tls", + manual_cmd_log=None, + use_mcs=False, ): """Create jobspec for running a server""" container_name = dockerjob.random_name( @@ -1813,7 +1817,9 @@ def aggregate_http2_results(stdout): if args.mcs_cs: if not args.use_docker: - print('MCS connection scaling test can only be run with --use-docker') + print( + "MCS connection scaling test can only be run with --use-docker" + ) else: languages_for_mcs_cs = set( _LANGUAGES[l] @@ -1821,34 +1827,41 @@ def aggregate_http2_results(stdout): if "all" in args.language or l in args.language ) if len(languages_for_mcs_cs) > 0: - print('Using java for MCS connection scaling server ignoring any args for server languages') + print( + "Using java for MCS connection scaling server ignoring any args for server languages" + ) mcs_server_jobspec = server_jobspec( - _LANGUAGES['java'], - docker_images.get('java'), + _LANGUAGES["java"], + docker_images.get("java"), args.transport_security, manual_cmd_log=server_manual_cmd_log, use_mcs=True, ) - print('mcs_server_jobspec shortname: ' + mcs_server_jobspec.shortname) + print( + "mcs_server_jobspec shortname: " + + mcs_server_jobspec.shortname + ) mcs_server_job = dockerjob.DockerJob(mcs_server_jobspec) jobs.append(mcs_server_job) - + for language in languages_for_mcs_cs: test_job = cloud_to_cloud_jobspec( language, - 'mcs', - 'java-mcs', - 'localhost', + "mcs", + "java-mcs", + "localhost", mcs_server_job.mapped_port(_DEFAULT_SERVER_PORT), docker_image=docker_images.get(str(language)), transport_security=args.transport_security, manual_cmd_log=client_manual_cmd_log, ) - print('mcs test job shortname: ' + test_job.shortname) + print("mcs test job shortname: " + test_job.shortname) jobs.append(test_job) else: - print('MCS connection scaling tests will be skipped since none of the supported client languages for MCS connection scaling testcases was specified') - + print( + "MCS connection scaling tests will be skipped since none of the supported client languages for MCS connection scaling testcases was specified" + ) + if not jobs: print("No jobs to run.") for image in six.itervalues(docker_images):