From 4bb2eb2241ce3793b57245abfd4164825badbd59 Mon Sep 17 00:00:00 2001
From: Jorge Canizales <jcanizales@google.com>
Date: Fri, 29 Jul 2016 13:59:43 -0700
Subject: [PATCH] Reset all host configs *before* setting what we need
Not after :) This fixes the local server tests failing to SSL handshake.
---
src/objective-c/tests/InteropTestsLocalCleartext.m | 4 ++--
src/objective-c/tests/InteropTestsLocalSSL.m | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/objective-c/tests/InteropTestsLocalCleartext.m b/src/objective-c/tests/InteropTestsLocalCleartext.m
index 56927a8af6..c4ee0de705 100644
--- a/src/objective-c/tests/InteropTestsLocalCleartext.m
+++ b/src/objective-c/tests/InteropTestsLocalCleartext.m
@@ -48,10 +48,10 @@ static NSString * const kLocalCleartextHost = @"localhost:5050";
}
- (void)setUp {
+ [super setUp];
+
// Register test server as non-SSL.
[GRPCCall useInsecureConnectionsForHost:kLocalCleartextHost];
-
- [super setUp];
}
@end
diff --git a/src/objective-c/tests/InteropTestsLocalSSL.m b/src/objective-c/tests/InteropTestsLocalSSL.m
index f0f4b1d71f..27f025e614 100644
--- a/src/objective-c/tests/InteropTestsLocalSSL.m
+++ b/src/objective-c/tests/InteropTestsLocalSSL.m
@@ -48,13 +48,13 @@ static NSString * const kLocalSSLHost = @"localhost:5051";
}
- (void)setUp {
+ [super setUp];
+
// Register test server certificates and name.
NSBundle *bundle = [NSBundle bundleForClass:self.class];
NSString *certsPath = [bundle pathForResource:@"TestCertificates.bundle/test-certificates"
ofType:@"pem"];
[GRPCCall useTestCertsPath:certsPath testName:@"foo.test.google.fr" forHost:kLocalSSLHost];
-
- [super setUp];
}
- (void)testExceptions {
--
GitLab