Index: third_party/grpc/tools/dockerfile/grpc_interop_go/build_interop.sh |
diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py b/third_party/grpc/tools/dockerfile/grpc_interop_go/build_interop.sh |
old mode 100644 |
new mode 100755 |
similarity index 60% |
copy from third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py |
copy to third_party/grpc/tools/dockerfile/grpc_interop_go/build_interop.sh |
index 4206831cb5135d5e03928bf9d995b2bf9e156018..224b0040c04e35a1bd28ccc66a6968c4ae74da9e |
--- a/third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py |
+++ b/third_party/grpc/tools/dockerfile/grpc_interop_go/build_interop.sh |
@@ -1,4 +1,5 @@ |
-# Copyright 2012, Google Inc. |
+#!/bin/bash |
+# Copyright 2015-2016, Google Inc. |
# All rights reserved. |
# |
# Redistribution and use in source and binary forms, with or without |
@@ -26,23 +27,27 @@ |
# 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. |
+# |
+# Builds Go interop server and client in a base image. |
+set -e |
+# Clone just the grpc-go source code without any dependencies. |
+# We are cloning from a local git repo that contains the right revision |
+# to test instead of using "go get" to download from Github directly. |
+git clone --recursive /var/local/jenkins/grpc-go src/google.golang.org/grpc |
-_GOODBYE_MESSAGE = u'Goodbye' |
- |
- |
-def web_socket_do_extra_handshake(request): |
- request.ws_extension_processors = [] |
+# copy service account keys if available |
+cp -r /var/local/jenkins/service_account $HOME || true |
+# Get dependencies from GitHub |
+# NOTE: once grpc-go dependencies change, this needs to be updated manually |
+# but we don't expect this to happen any time soon. |
+go get github.com/golang/protobuf/proto |
+go get golang.org/x/net/context |
+go get golang.org/x/net/trace |
+go get golang.org/x/oauth2 |
+go get google.golang.org/cloud |
-def web_socket_transfer_data(request): |
- while True: |
- line = request.ws_stream.receive_message() |
- if line is None: |
- return |
- if isinstance(line, unicode): |
- request.ws_stream.send_message(line, binary=False) |
- if line == _GOODBYE_MESSAGE: |
- return |
- else: |
- request.ws_stream.send_message(line, binary=True) |
+# Build the interop client and server |
+(cd src/google.golang.org/grpc/interop/client && go install) |
+(cd src/google.golang.org/grpc/interop/server && go install) |