diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-05-09 23:18:34 -0700 |
|---|---|---|
| committer | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-05-09 23:18:34 -0700 |
| commit | fac1b4d220bc0c06b997503d550889dfbea3a14c (patch) | |
| tree | e23c88785f97a3ed0bf3db943cf2bc3e7564790b /test | |
| parent | b98e24b32b708c929cf14ea13f5fc94234a56995 (diff) | |
| parent | 6915e6b96f607d01e674dbb22855b84bc7b2bfc1 (diff) | |
Merge pull request #6475 from grpc/release-0_14
Upmerge from 0.14.0
Diffstat (limited to 'test')
| -rwxr-xr-x | test/distrib/python/run_distrib_test.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/distrib/python/run_distrib_test.sh b/test/distrib/python/run_distrib_test.sh index 6196e540c8..8a983bc248 100755 --- a/test/distrib/python/run_distrib_test.sh +++ b/test/distrib/python/run_distrib_test.sh @@ -48,7 +48,10 @@ which $PYTHON || PYTHON=python which $PIP || PIP=pip # TODO(jtattermusch): this shouldn't be required -${PIP} install --upgrade six pip +# TODO(jtattermusch): run the command twice to workaround docker-on-overlay +# issue https://github.com/docker/docker/issues/12327 +# (first attempt will fail when using docker with overlayFS) +${PIP} install --upgrade six pip || ${PIP} install --upgrade six pip # At least one of the bdist packages has to succeed (whichever one matches the # test machine, anyway). @@ -58,6 +61,6 @@ done # 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 -m grpc.tools.protoc $PYTHON distribtest.py |