diff options
author | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-05-05 17:52:12 -0700 |
---|---|---|
committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-05-05 17:52:12 -0700 |
commit | 27ca074605554c1cfb6427dd90f3992017dfce55 (patch) | |
tree | dcd3253fb4b2e77834fa68a556a04b966fd35a95 /test/distrib | |
parent | 900ed58732c139f66fa93e06ba0b136dc5067868 (diff) | |
parent | b836b5bfee46e9d1ee211dba31a9b22c03339b57 (diff) |
Merge pull request #6450 from nicolasnoble/gopro
Continuation of #6280.
Diffstat (limited to 'test/distrib')
-rwxr-xr-x | test/distrib/python/run_distrib_test.sh | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/test/distrib/python/run_distrib_test.sh b/test/distrib/python/run_distrib_test.sh index 79893af8e5..6196e540c8 100755 --- a/test/distrib/python/run_distrib_test.sh +++ b/test/distrib/python/run_distrib_test.sh @@ -33,8 +33,8 @@ set -ex cd $(dirname $0) # Pick up the source dist archive whatever its version is -SDIST_ARCHIVE=$EXTERNAL_GIT_ROOT/input_artifacts/grpcio-*.tar.gz -BDIST_DIR="file://$EXTERNAL_GIT_ROOT/input_artifacts" +BDIST_ARCHIVES=$EXTERNAL_GIT_ROOT/input_artifacts/grpcio-*.whl +TOOLS_BDIST_ARCHIVES=$EXTERNAL_GIT_ROOT/input_artifacts/grpcio_tools-*.whl if [ ! -f ${SDIST_ARCHIVE} ] then @@ -42,17 +42,22 @@ then exit 1 fi -PIP=pip2 -which $PIP || PIP=pip PYTHON=python2 +PIP=pip2 which $PYTHON || PYTHON=python +which $PIP || PIP=pip # TODO(jtattermusch): this shouldn't be required -$PIP install --upgrade six +${PIP} install --upgrade six pip -GRPC_PYTHON_BINARIES_REPOSITORY="${BDIST_DIR}" \ - $PIP install \ - ${SDIST_ARCHIVE} +# At least one of the bdist packages has to succeed (whichever one matches the +# test machine, anyway). +for bdist in ${BDIST_ARCHIVES} ${TOOLS_BDIST_ARCHIVES}; do + ($PYTHON -m pip install $bdist) || true +done -$PYTHON distribtest.py +# TODO(jtattermusch): add a .proto file to the distribtest, generate python +# code from it and then use the generated code from distribtest.py +$PYTHON -m grpc.protoc.compiler +$PYTHON distribtest.py |