diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-04-04 13:54:41 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-04-04 13:54:41 -0700 |
| commit | 38ec40608f693ffcc52120d5d31bec9084930537 (patch) | |
| tree | bd15604e7eea09cbf9ed4596ce42c9b5b7740f59 /src/python/grpcio/tests/interop/_secure_interop_test.py | |
| parent | c532c21ee52bdcddf7292560673a61538ea3d29f (diff) | |
| parent | 1b7c0a2c5cf27d7a77d9c3476fe6406a98ca3d76 (diff) | |
Merge github.com:grpc/grpc into split-me-baby-one-more-time
Diffstat (limited to 'src/python/grpcio/tests/interop/_secure_interop_test.py')
| -rw-r--r-- | src/python/grpcio/tests/interop/_secure_interop_test.py | 4 |
1 files changed, 2 insertions, 2 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): |