| Index: third_party/grpc/test/distrib/python/run_distrib_test.sh
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py b/third_party/grpc/test/distrib/python/run_distrib_test.sh
|
| old mode 100644
|
| new mode 100755
|
| similarity index 71%
|
| copy from third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py
|
| copy to third_party/grpc/test/distrib/python/run_distrib_test.sh
|
| index 429f58186e3fce43dc21e81e0f9d7e20c7e0bf70..8fd7ffb54c8ad9f07571ef929efd7d35ab0cd610
|
| --- a/third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py
|
| +++ b/third_party/grpc/test/distrib/python/run_distrib_test.sh
|
| @@ -1,4 +1,5 @@
|
| -# Copyright 2010, Google Inc.
|
| +#!/bin/bash
|
| +# Copyright 2015-2016, Google Inc.
|
| # All rights reserved.
|
| #
|
| # Redistribution and use in source and binary forms, with or without
|
| @@ -27,20 +28,31 @@
|
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| +set -ex
|
|
|
| -from mod_pywebsocket import msgutil
|
| +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"
|
|
|
| -_GOODBYE_MESSAGE = 'Goodbye'
|
| +if [ ! -f ${SDIST_ARCHIVE} ]
|
| +then
|
| + echo "Archive ${SDIST_ARCHIVE} does not exist."
|
| + exit 1
|
| +fi
|
|
|
| +PIP=pip2
|
| +which $PIP || PIP=pip
|
| +PYTHON=python2
|
| +which $PYTHON || PYTHON=python
|
|
|
| -def web_socket_do_extra_handshake(request):
|
| - pass # Always accept.
|
| +# TODO(jtattermusch): this shouldn't be required
|
| +$PIP install --upgrade six
|
|
|
| +GRPC_PYTHON_BINARIES_REPOSITORY="${BDIST_DIR}" \
|
| + $PIP install \
|
| + ${SDIST_ARCHIVE}
|
| +
|
| +$PYTHON distribtest.py
|
|
|
| -def web_socket_transfer_data(request):
|
| - while True:
|
| - line = msgutil.receive_message(request)
|
| - msgutil.send_message(request, line)
|
| - if line == _GOODBYE_MESSAGE:
|
| - return
|
|
|