From f49936acef3cd54d758b7253404be4f1884f965a Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 16 Sep 2015 15:44:26 -0700 Subject: [PATCH] make python generate args for interop tests --- tools/jenkins/run_local.sh | 2 +- tools/run_tests/run_interop_test.sh | 58 -------------- tools/run_tests/run_interop_tests.py | 114 ++++++++++++++++++++++++--- 3 files changed, 106 insertions(+), 68 deletions(-) delete mode 100755 tools/run_tests/run_interop_test.sh diff --git a/tools/jenkins/run_local.sh b/tools/jenkins/run_local.sh index f9d8d26e9a6..4891637bbf9 100755 --- a/tools/jenkins/run_local.sh +++ b/tools/jenkins/run_local.sh @@ -49,7 +49,7 @@ export config=opt # -- use interop to run dockerized interop tests export platform=interop -# language: one of languages supported by run_tests.py +# language: one of languages supported by run_tests.py or run_interop_tests.py export language=all # architecture diff --git a/tools/run_tests/run_interop_test.sh b/tools/run_tests/run_interop_test.sh deleted file mode 100755 index 255760ba849..00000000000 --- a/tools/run_tests/run_interop_test.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash - -# Copyright 2015, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -language=$1 -test_case=$2 - -# change dir gRPC repo root -cd $(dirname $0)/../.. - -set -e -if [ "$language" = "c++" ] -then - bins/opt/interop_client --enable_ssl --use_prod_roots --server_host_override=grpc-test.sandbox.google.com --server_host=grpc-test.sandbox.google.com --server_port=443 --test_case=$test_case -elif [ "$language" = "node" ] -then - SSL_CERT_FILE=/usr/local/share/grpc/roots.pem node src/node/interop/interop_client.js --use_tls=true --server_port=443 --server_host=grpc-test.sandbox.google.com --server_host_override=grpc-test.sandbox.google.com --test_case=$test_case -elif [ "$language" = "ruby" ] -then - SSL_CERT_FILE=/usr/local/share/grpc/roots.pem ruby src/ruby/bin/interop/interop_client.rb --use_tls --server_port=443 --server_host=grpc-test.sandbox.google.com --server_host_override=grpc-test.sandbox.google.com --test_case=$test_case -elif [ "$language" = "csharp" ] -then - (cd src/csharp/Grpc.IntegrationTesting.Client/bin/Debug && SSL_CERT_FILE=/usr/local/share/grpc/roots.pem mono Grpc.IntegrationTesting.Client.exe --use_tls --server_port=443 --server_host=grpc-test.sandbox.google.com --server_host_override=grpc-test.sandbox.google.com --test_case=$test_case) -elif [ "$language" = "php" ] -then - SSL_CERT_FILE=/usr/local/share/grpc/roots.pem src/php/bin/interop_client.sh --server_port=443 --server_host=grpc-test.sandbox.google.com --server_host_override=grpc-test.sandbox.google.com --test_case=$test_case -else - echo "interop tests not added for $language" - exit 1 -fi - diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index 24410778dcd..05fd0bb27bb 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -35,8 +35,93 @@ import itertools import xml.etree.cElementTree as ET import jobset + +_CLOUD_TO_PROD_BASE_ARGS = [ + '--server_host_override=grpc-test.sandbox.google.com', + '--server_host=grpc-test.sandbox.google.com', + '--server_port=443'] + +# TOOD(jtattermusch) wrapped languages use this variable for location +# of roots.pem. We might want to use GRPC_DEFAULT_SSL_ROOTS_FILE_PATH +# supported by C core SslCredentials instead. +_SSL_CERT_ENV = { 'SSL_CERT_FILE':'/usr/local/share/grpc/roots.pem' } + +# TODO(jtatttermusch) unify usage of --enable_ssl, --use_tls and --use_tls=true + +class CXXLanguage: + + def __init__(self): + self.client_cmdline_base = ['bins/opt/interop_client'] + self.client_cwd = None + + def cloud_to_prod_args(self): + return (self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS + + ['--enable_ssl','--use_prod_roots']) + + def cloud_to_prod_env(self): + return None + + def __str__(self): + return 'c++' + + +class CSharpLanguage: + + def __init__(self): + self.client_cmdline_base = ['mono', 'Grpc.IntegrationTesting.Client.exe'] + self.client_cwd = 'src/csharp/Grpc.IntegrationTesting.Client/bin/Debug' + + def cloud_to_prod_args(self): + return (self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS + + ['--use_tls']) + + def cloud_to_prod_env(self): + return _SSL_CERT_ENV + + def __str__(self): + return 'csharp' + + +class NodeLanguage: + + def __init__(self): + self.client_cmdline_base = ['node', 'src/node/interop/interop_client.js'] + self.client_cwd = None + + def cloud_to_prod_args(self): + return (self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS + + ['--use_tls=true']) + + def cloud_to_prod_env(self): + return _SSL_CERT_ENV + + def __str__(self): + return 'node' + +class RubyLanguage: + + def __init__(self): + self.client_cmdline_base = ['ruby', 'src/ruby/bin/interop/interop_client.rb'] + self.client_cwd = None + + def cloud_to_prod_args(self): + return (self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS + + ['--use_tls']) + + def cloud_to_prod_env(self): + return _SSL_CERT_ENV + + def __str__(self): + return 'ruby' + + # TODO(jtattermusch): add php and python once we get them working -_LANGUAGES = ['c++', 'node', 'csharp', 'ruby'] +_LANGUAGES = { + 'c++' : CXXLanguage(), + 'csharp' : CSharpLanguage(), + 'node' : NodeLanguage(), + 'ruby' : RubyLanguage(), +} # TODO(jtattermusch): add empty_stream once C++ start supporting it. # TODO(jtattermusch): add support for auth tests. @@ -45,6 +130,17 @@ _TEST_CASES = ['large_unary', 'empty_unary', 'ping_pong', 'cancel_after_begin', 'cancel_after_first_response', 'timeout_on_sleeping_server'] +def cloud_to_prod_jobspec(language, test_case): + """Creates jobspec for cloud-to-prod interop test""" + cmdline = language.cloud_to_prod_args() + ['--test_case=%s' % test_case] + test_job = jobset.JobSpec( + cmdline=cmdline, + cwd=language.client_cwd, + shortname="cloud_to_prod:%s:%s" % (language, test_case), + environ=language.cloud_to_prod_env(), + timeout_seconds=60) + return test_job + argp = argparse.ArgumentParser(description='Run interop tests.') argp.add_argument('-l', '--language', choices=['all'] + sorted(_LANGUAGES), @@ -52,18 +148,18 @@ argp.add_argument('-l', '--language', default=['all']) args = argp.parse_args() -languages = [l for l in itertools.chain.from_iterable( - iter(_LANGUAGES) if x == 'all' else [x] - for x in args.language)] +languages = set(_LANGUAGES[l] + for l in itertools.chain.from_iterable( + _LANGUAGES.iterkeys() if x == 'all' else [x] + for x in args.language)) +# TODO(jtattermusch): make python script generate cmdline params for interop +# tests. It's easier to manage than in a shell script. jobs = [] jobNumber = 0 for language in languages: - for test in _TEST_CASES: - test_job = jobset.JobSpec( - cmdline=['tools/run_tests/run_interop_test.sh', '%s' % language, '%s' % test], - shortname="cloud_to_prod:%s:%s" % (language, test), - timeout_seconds=60) + for test_case in _TEST_CASES: + test_job = cloud_to_prod_jobspec(language, test_case) jobs.append(test_job) jobNumber+=1