| Index: third_party/grpc/src/python/grpcio/tests/unit/resources.py
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py b/third_party/grpc/src/python/grpcio/tests/unit/resources.py
|
| similarity index 70%
|
| copy from third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py
|
| copy to third_party/grpc/src/python/grpcio/tests/unit/resources.py
|
| index 429f58186e3fce43dc21e81e0f9d7e20c7e0bf70..023cdb155f26dcd692082aa1b7f18f6120fc17e7 100644
|
| --- a/third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py
|
| +++ b/third_party/grpc/src/python/grpcio/tests/unit/resources.py
|
| @@ -1,4 +1,4 @@
|
| -# Copyright 2010, Google Inc.
|
| +# Copyright 2015, Google Inc.
|
| # All rights reserved.
|
| #
|
| # Redistribution and use in source and binary forms, with or without
|
| @@ -27,20 +27,26 @@
|
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| +"""Constants and functions for data used in interoperability testing."""
|
|
|
| -from mod_pywebsocket import msgutil
|
| +import os
|
|
|
| +import pkg_resources
|
|
|
| -_GOODBYE_MESSAGE = 'Goodbye'
|
| +_ROOT_CERTIFICATES_RESOURCE_PATH = 'credentials/ca.pem'
|
| +_PRIVATE_KEY_RESOURCE_PATH = 'credentials/server1.key'
|
| +_CERTIFICATE_CHAIN_RESOURCE_PATH = 'credentials/server1.pem'
|
|
|
|
|
| -def web_socket_do_extra_handshake(request):
|
| - pass # Always accept.
|
| +def test_root_certificates():
|
| + return pkg_resources.resource_string(
|
| + __name__, _ROOT_CERTIFICATES_RESOURCE_PATH)
|
|
|
|
|
| -def web_socket_transfer_data(request):
|
| - while True:
|
| - line = msgutil.receive_message(request)
|
| - msgutil.send_message(request, line)
|
| - if line == _GOODBYE_MESSAGE:
|
| - return
|
| +def private_key():
|
| + return pkg_resources.resource_string(__name__, _PRIVATE_KEY_RESOURCE_PATH)
|
| +
|
| +
|
| +def certificate_chain():
|
| + return pkg_resources.resource_string(
|
| + __name__, _CERTIFICATE_CHAIN_RESOURCE_PATH)
|
|
|