Merge 518b308 into a467892

couchbase · Jul 2, 2020 · 8727621 · 8727621
2 parents a467892 + 518b308
commit 8727621
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 67 deletions.
diff --git a/Objective-C/Tests/TLSIdentityTest.m b/Objective-C/Tests/TLSIdentityTest.m
@@ -193,7 +193,9 @@ - (void) tearDown {
 }
 
 - (void) testCreateGetDeleteServerIdentity {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     NSError* error;
     CBLTLSIdentity* identity;
@@ -237,7 +239,9 @@ - (void) testCreateGetDeleteServerIdentity {
 }
 
 - (void) testCreateDuplicateServerIdentity {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     NSError* error;
     CBLTLSIdentity* identity;
@@ -272,7 +276,9 @@ - (void) testCreateDuplicateServerIdentity {
 }
 
 - (void) testCreateGetDeleteClientIdentity {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     NSError* error;
     CBLTLSIdentity* identity;
@@ -316,7 +322,9 @@ - (void) testCreateGetDeleteClientIdentity {
 }
 
 - (void) testCreateDuplicateClientIdentity {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     NSError* error;
     CBLTLSIdentity* identity;
@@ -351,7 +359,9 @@ - (void) testCreateDuplicateClientIdentity {
 }
 
 - (void) testGetIdentityWithIdentity {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     // Use SecPKCS12Import to import the PKCS12 data:
     __block CFArrayRef result = NULL;
@@ -404,7 +414,9 @@ - (void) testGetIdentityWithIdentity {
 }
 
 - (void) testImportIdentity {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     NSData* data = [self dataFromResource: @"identity/certs" ofType: @"p12"];
 
@@ -442,7 +454,9 @@ - (void) testImportIdentity {
 }
 
 - (void) testCreateIdentityWithNoAttributes {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     NSError* error;
     CBLTLSIdentity* identity;
@@ -469,7 +483,9 @@ - (void) testCreateIdentityWithNoAttributes {
 }
 
 - (void) testCertificateExpiration {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     NSError* error;
     CBLTLSIdentity* identity;

diff --git a/Objective-C/Tests/URLEndpointListenerTest.m b/Objective-C/Tests/URLEndpointListenerTest.m
@@ -316,7 +316,9 @@ - (void) testBusyPort {
 }
 
 - (void) testTLSIdentity {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     // Disabled TLS:
     Config* config = [[Config alloc] initWithDatabase: self.otherDB];
@@ -364,7 +366,9 @@ - (void) testTLSIdentity {
 }
 
 - (void) testURLs {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     Config* config = [[Config alloc] initWithDatabase: self.otherDB];
     _listener = [[Listener alloc] initWithConfig: config];
@@ -458,7 +462,9 @@ - (void) testPaswordAuthenticator {
 }
 
 - (void) testClientCertAuthenticatorWithBlock API_AVAILABLE(macos(10.12), ios(10.3)) {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     // Listener:
     CBLListenerCertificateAuthenticator* listenerAuth =
@@ -506,7 +512,9 @@ - (void) testClientCertAuthenticatorWithBlock API_AVAILABLE(macos(10.12), ios(10
 }
 
 - (void) testClientCertAuthenticatorRootCerts {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     NSData* rootCertData = [self dataFromResource: @"identity/client-ca" ofType: @"der"];
     SecCertificateRef rootCertRef = SecCertificateCreateWithData(kCFAllocatorDefault, (CFDataRef)rootCertData);
@@ -551,7 +559,9 @@ - (void) testClientCertAuthenticatorRootCerts {
 }
 
 - (void) testServerCertVerificationModeSelfSignedCert {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     // Listener:
     Listener* listener = [self listenWithTLS: YES];
@@ -588,7 +598,9 @@ - (void) testServerCertVerificationModeSelfSignedCert {
 }
 
 - (void) testServerCertVerificationModeCACert {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     // Listener:
     Listener* listener = [self listenWithTLS: YES];
@@ -625,7 +637,9 @@ - (void) testServerCertVerificationModeCACert {
 }
 
 - (void) testEmptyNetworkInterface {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     [self listen];
     NSArray* urls = _listener.urls;
@@ -679,7 +693,9 @@ - (void) testEmptyNetworkInterface {
 }
 
 - (void) testUnavailableNetworkInterface {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     Config* config = [[Config alloc] initWithDatabase: self.otherDB];
     config.networkInterface = @"1.1.1.256";
@@ -694,7 +710,9 @@ - (void) testUnavailableNetworkInterface {
 }
 
 - (void) testNetworkInterfaceName {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     NSArray* interfaces = [Listener allInterfaceNames];
     for (NSString* i in interfaces) {
@@ -710,7 +728,9 @@ - (void) testNetworkInterfaceName {
 }
 
 - (void) testMultipleListenersOnSameDatabase {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     Config* config = [[Config alloc] initWithDatabase: self.otherDB];
     Listener* listener1 = [[Listener alloc] initWithConfig: config];
@@ -739,7 +759,9 @@ - (void) testMultipleListenersOnSameDatabase {
 
 // TODO: https://issues.couchbase.com/browse/CBL-1033
 - (void) _testMultipleReplicatorsToListener {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     [self listen]; // writable listener
 
@@ -757,7 +779,9 @@ - (void) _testMultipleReplicatorsToListener {
 
 // TODO: https://issues.couchbase.com/browse/CBL-1033
 - (void) _testMultipleReplicatorsOnReadOnlyListener {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     Config* config = [[Config alloc] initWithDatabase: self.otherDB];
     config.readOnly = YES;
@@ -781,7 +805,9 @@ - (void) _testMultipleReplicatorsOnReadOnlyListener {
  3. Replicator#2  (DB#2 -> otherDB)
  */
 - (void) testReplicatorAndListenerOnSameDatabase {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     XCTestExpectation* exp1 = [self expectationWithDescription: @"replicator#1 stopped"];
     XCTestExpectation* exp2 = [self expectationWithDescription: @"replicator#2 stopped"];
@@ -851,7 +877,9 @@ - (void) testReplicatorAndListenerOnSameDatabase {
 
 // TODO: https://issues.couchbase.com/browse/CBL-954
 - (void) _testReadOnlyListener {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     Config* config = [[Config alloc] initWithDatabase: self.otherDB];
     config.readOnly = YES;
@@ -873,7 +901,9 @@ - (void) _testReadOnlyListener {
 }
 
 - (void) testCloseWithActiveListener {
-    if (!self.keyChainAccessAllowed) return;
+    [self ignoreExceptionBreakPointOnly: ^{
+        XCTSkipUnless(self.keyChainAccessAllowed, @"Skipping, keychain not accessible in this config");
+    }];
 
     [self listen];
 

diff --git a/Swift/Tests/TLSIdentityTest.swift b/Swift/Tests/TLSIdentityTest.swift
@@ -149,7 +149,7 @@ class TLSIdentityTest: CBLTestCase {
     }
 
     func testCreateGetDeleteServerIdentity() throws {
-        if (!keyChainAccessAllowed) { return }
+        try XCTSkipUnless(keyChainAccessAllowed, "Skipping, keychain is not allowed in this config")
 
         // Delete:
         try TLSIdentity.deleteIdentity(withLabel: serverCertLabel)
@@ -183,7 +183,7 @@ class TLSIdentityTest: CBLTestCase {
     }
 
     func testCreateDuplicateServerIdentity() throws {
-        if (!keyChainAccessAllowed) { return }
+        try XCTSkipUnless(keyChainAccessAllowed, "Skipping, keychain is not allowed in this config")
 
         // Create:
         var identity: TLSIdentity?
@@ -211,7 +211,7 @@ class TLSIdentityTest: CBLTestCase {
     }
 
     func testCreateGetDeleteClientIdentity() throws {
-        if (!keyChainAccessAllowed) { return }
+        try XCTSkipUnless(keyChainAccessAllowed, "Skipping, keychain is not allowed in this config")
 
         // Delete:
         try TLSIdentity.deleteIdentity(withLabel: clientCertLabel)
@@ -245,7 +245,7 @@ class TLSIdentityTest: CBLTestCase {
     }
 
     func testCreateDuplicateClientIdentity() throws {
-        if (!keyChainAccessAllowed) { return }
+        try XCTSkipUnless(keyChainAccessAllowed, "Skipping, keychain is not allowed in this config")
 
         // Create:
         var identity: TLSIdentity?
@@ -273,7 +273,7 @@ class TLSIdentityTest: CBLTestCase {
     }
 
     func testGetIdentityWithIdentity() throws {
-        if (!keyChainAccessAllowed) { return }
+        try XCTSkipUnless(keyChainAccessAllowed, "Skipping, keychain is not allowed in this config")
 
         // Use SecPKCS12Import to import the PKCS12 data:
         var result : CFArray?
@@ -318,7 +318,7 @@ class TLSIdentityTest: CBLTestCase {
     }
 
     func testImportIdentity() throws {
-        if (!keyChainAccessAllowed) { return }
+        try XCTSkipUnless(keyChainAccessAllowed, "Skipping, keychain is not allowed in this config")
 
         let data = try dataFromResource(name: "identity/certs", ofType: "p12")
 
@@ -351,7 +351,7 @@ class TLSIdentityTest: CBLTestCase {
     }
 
     func testCreateIdentityWithNoAttributes() throws {
-        if (!keyChainAccessAllowed) { return }
+        try XCTSkipUnless(keyChainAccessAllowed, "Skipping, keychain is not allowed in this config")
 
         // Delete:
         try TLSIdentity.deleteIdentity(withLabel: serverCertLabel)
@@ -370,7 +370,7 @@ class TLSIdentityTest: CBLTestCase {
     }
 
     func testCertificateExpiration() throws {
-        if (!keyChainAccessAllowed) { return }
+        try XCTSkipUnless(keyChainAccessAllowed, "Skipping, keychain is not allowed in this config")
 
         // Delete:
         try TLSIdentity.deleteIdentity(withLabel: serverCertLabel)