| Index: third_party/grpc/src/ruby/bin/interop/interop_server.rb
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py b/third_party/grpc/src/ruby/bin/interop/interop_server.rb
|
| old mode 100644
|
| new mode 100755
|
| similarity index 64%
|
| copy from third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py
|
| copy to third_party/grpc/src/ruby/bin/interop/interop_server.rb
|
| index 4206831cb5135d5e03928bf9d995b2bf9e156018..c6b0d00ec6361daa69d0460b267c516b82d7f602
|
| --- a/third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py
|
| +++ b/third_party/grpc/src/ruby/bin/interop/interop_server.rb
|
| @@ -1,4 +1,6 @@
|
| -# Copyright 2012, Google Inc.
|
| +#!/usr/bin/env ruby
|
| +
|
| +# Copyright 2015, Google Inc.
|
| # All rights reserved.
|
| #
|
| # Redistribution and use in source and binary forms, with or without
|
| @@ -27,22 +29,22 @@
|
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| +# #######################################################################
|
| +# DEPRECATED: The behaviour in this file has been moved to pb/test/server.rb
|
| +#
|
| +# This file remains to support existing tools and scripts that use it.
|
| +# ######################################################################
|
| +#
|
| +# interop_server is a Testing app that runs a gRPC interop testing server.
|
| +#
|
| +# It helps validate interoperation b/w gRPC in different environments
|
| +#
|
| +# Helps validate interoperation b/w different gRPC implementations.
|
| +#
|
| +# Usage: $ path/to/interop_server.rb --port
|
|
|
| -_GOODBYE_MESSAGE = u'Goodbye'
|
| -
|
| -
|
| -def web_socket_do_extra_handshake(request):
|
| - request.ws_extension_processors = []
|
| -
|
| +this_dir = File.expand_path(File.dirname(__FILE__))
|
| +pb_dir = File.join(File.dirname(File.dirname(this_dir)), 'pb')
|
| +$LOAD_PATH.unshift(pb_dir) unless $LOAD_PATH.include?(pb_dir)
|
|
|
| -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)
|
| +require 'test/server'
|
|
|