diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2018-12-21 11:12:46 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-12-21 11:12:46 +0100 |
| commit | 95511c0cfd13a85a83e2d457b75fcc8c201adb33 (patch) | |
| tree | ddc0f19e93f41b51a4dbef1b452ef98cc1c5613f /src/python/grpcio_tests | |
| parent | 102d5d88a626e29f1dccc4ffdb977d1bcd7a5937 (diff) | |
| parent | dcb194c6e3836e57ca41ef13ab1ee633590a5af4 (diff) | |
Merge pull request #17407 from jtattermusch/interop_csharp_sni_fix
better testing of SNI for C-based languages
Diffstat (limited to 'src/python/grpcio_tests')
| -rw-r--r-- | src/python/grpcio_tests/tests/interop/client.py | 12 | ||||
| -rw-r--r-- | src/python/grpcio_tests/tests/stress/client.py | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/python/grpcio_tests/tests/interop/client.py b/src/python/grpcio_tests/tests/interop/client.py index 698c37017f..56cb29477c 100644 --- a/src/python/grpcio_tests/tests/interop/client.py +++ b/src/python/grpcio_tests/tests/interop/client.py @@ -54,7 +54,6 @@ def _args(): help='replace platform root CAs with ca.pem') parser.add_argument( '--server_host_override', - default="foo.test.google.fr", type=str, help='the server host to which to claim to connect') parser.add_argument( @@ -100,10 +99,13 @@ def _stub(args): channel_credentials = grpc.composite_channel_credentials( channel_credentials, call_credentials) - channel = grpc.secure_channel(target, channel_credentials, (( - 'grpc.ssl_target_name_override', - args.server_host_override, - ),)) + channel_opts = None + if args.server_host_override: + channel_opts = (( + 'grpc.ssl_target_name_override', + args.server_host_override, + ),) + channel = grpc.secure_channel(target, channel_credentials, channel_opts) else: channel = grpc.insecure_channel(target) if args.test_case == "unimplemented_service": diff --git a/src/python/grpcio_tests/tests/stress/client.py b/src/python/grpcio_tests/tests/stress/client.py index a318b308e6..4c35b05044 100644 --- a/src/python/grpcio_tests/tests/stress/client.py +++ b/src/python/grpcio_tests/tests/stress/client.py @@ -71,7 +71,6 @@ def _args(): '--use_tls', help='Whether to use TLS', default=False, type=bool) parser.add_argument( '--server_host_override', - default="foo.test.google.fr", help='the server host to which to claim to connect', type=str) return parser.parse_args() |