diff options
author | 2015-08-12 12:00:36 -0700 | |
---|---|---|
committer | 2015-08-12 12:00:36 -0700 | |
commit | d067c263b250657891de4ad96ae51249435c6066 (patch) | |
tree | 03611c21ff494f0652e70d424af1dddae4c1da28 /src/objective-c/GRPCClient/GRPCCall+Tests.m | |
parent | d5689305612f5597716a4337ce934883a472a266 (diff) | |
parent | 826f07eb6f8dc2366375b7c96cc12bca1302518c (diff) |
Merge github.com:grpc/grpc into y12kdm3
Conflicts:
src/core/security/google_default_credentials.c
test/core/security/verify_jwt.c
Diffstat (limited to 'src/objective-c/GRPCClient/GRPCCall+Tests.m')
-rw-r--r-- | src/objective-c/GRPCClient/GRPCCall+Tests.m | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/objective-c/GRPCClient/GRPCCall+Tests.m b/src/objective-c/GRPCClient/GRPCCall+Tests.m index 7c5b81d661..bade0b2920 100644 --- a/src/objective-c/GRPCClient/GRPCCall+Tests.m +++ b/src/objective-c/GRPCClient/GRPCCall+Tests.m @@ -36,12 +36,18 @@ #import "private/GRPCHost.h" @implementation GRPCCall (Tests) + + (void)useTestCertsPath:(NSString *)certsPath testName:(NSString *)testName forHost:(NSString *)host { GRPCHost *hostConfig = [GRPCHost hostWithAddress:host]; - hostConfig.secure = YES; hostConfig.pathToCertificates = certsPath; hostConfig.hostNameOverride = testName; } + ++ (void)useInsecureConnectionsForHost:(NSString *)host { + GRPCHost *hostConfig = [GRPCHost hostWithAddress:host]; + hostConfig.secure = NO; +} + @end |