diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-03-31 17:56:29 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-03-31 17:56:29 -0700 |
| commit | 1fe942f777cb2720de80d536dabd8d80c4d0aec2 (patch) | |
| tree | ce904d9e4f83e9fb43f81da99ad6f2d9588e89b6 /src/python/grpcio/tests/interop | |
| parent | 4da87600dc8974f465acf286e155ff774bd96aa1 (diff) | |
| parent | ce2a2d041dd473408bb3e11c49e39cb689f20495 (diff) | |
Merge pull request #5700 from bluecmd/ssl-defaults
ssl_channel_credentials to use None by default
Diffstat (limited to 'src/python/grpcio/tests/interop')
| -rw-r--r-- | src/python/grpcio/tests/interop/_secure_interop_test.py | 4 | ||||
| -rw-r--r-- | src/python/grpcio/tests/interop/client.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/python/grpcio/tests/interop/_secure_interop_test.py b/src/python/grpcio/tests/interop/_secure_interop_test.py index 7e3061133f..1a1a063a6f 100644 --- a/src/python/grpcio/tests/interop/_secure_interop_test.py +++ b/src/python/grpcio/tests/interop/_secure_interop_test.py @@ -1,4 +1,4 @@ -# Copyright 2015, Google Inc. +# Copyright 2015-2016, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -56,7 +56,7 @@ class SecureInteropTest( self.stub = test_pb2.beta_create_TestService_stub( test_utilities.not_really_secure_channel( '[::]', port, implementations.ssl_channel_credentials( - resources.test_root_certificates(), None, None), + resources.test_root_certificates()), _SERVER_HOST_OVERRIDE)) def tearDown(self): diff --git a/src/python/grpcio/tests/interop/client.py b/src/python/grpcio/tests/interop/client.py index 573ec2bd71..02a37cc6bc 100644 --- a/src/python/grpcio/tests/interop/client.py +++ b/src/python/grpcio/tests/interop/client.py @@ -1,4 +1,4 @@ -# Copyright 2015, Google Inc. +# Copyright 2015-2016, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -94,7 +94,7 @@ def _stub(args): channel = test_utilities.not_really_secure_channel( args.server_host, args.server_port, - implementations.ssl_channel_credentials(root_certificates, None, None), + implementations.ssl_channel_credentials(root_certificates), args.server_host_override) stub = test_pb2.beta_create_TestService_stub( channel, metadata_transformer=metadata_transformer) |