diff options
author | 2017-02-10 15:48:48 -0800 | |
---|---|---|
committer | 2017-02-24 10:49:51 -0800 | |
commit | 8e7e1e37fa8918b404796e7a86e6f476b691cb76 (patch) | |
tree | 3de00d42359d3af25203ba3a7c58f8ddc733e381 | |
parent | 992d5cd89b64438f3ece3551e00acb161de6071c (diff) |
Only run bad http2 server tests with supported client/server pairs.
-rwxr-xr-x | tools/run_tests/run_interop_tests.py | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index 6f26b498cd..b47dc1e8f2 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -895,7 +895,6 @@ try: spec = server_jobspec(http2InteropServer, docker_images.get(lang)) job = dockerjob.DockerJob(spec) server_jobs[lang] = job - server_addresses[lang] = ('localhost', _DEFAULT_SERVER_PORT) jobs = [] if args.cloud_to_prod: @@ -971,16 +970,16 @@ try: insecure=args.insecure) jobs.append(test_job) - if args.http2_badserver_interop: - for language in languages_http2_badserver_interop: - for test_case in _HTTP2_BADSERVER_TEST_CASES: - test_job = cloud_to_cloud_jobspec(language, - test_case, - server_name, - server_host, - server_port, - docker_image=docker_images.get(str(language))) - jobs.append(test_job) + if args.http2_badserver_interop: + for language in languages_http2_badserver_interop: + for test_case in _HTTP2_BADSERVER_TEST_CASES: + test_job = cloud_to_cloud_jobspec(language, + test_case, + str(http2InteropServer), + 'localhost', + _DEFAULT_SERVER_PORT, + docker_image=docker_images.get(str(language))) + jobs.append(test_job) if not jobs: print('No jobs to run.') |