From d492816664fe57bb4036187d7b28663990ee48f6 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sun, 30 Sep 2018 12:32:06 -0600 Subject: [PATCH] Fixup certificate parsing tests Skip failure when running tests when we're explicitly testing failure cases. Be more specific about failure conditions via NSError param --- SignalServiceKit/src/Contacts/CDSSigningCertificate.m | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SignalServiceKit/src/Contacts/CDSSigningCertificate.m b/SignalServiceKit/src/Contacts/CDSSigningCertificate.m index a7e5f1f0c..0b680da46 100644 --- a/SignalServiceKit/src/Contacts/CDSSigningCertificate.m +++ b/SignalServiceKit/src/Contacts/CDSSigningCertificate.m @@ -88,7 +88,7 @@ NSError *CDSSigningCertificateErrorMake(CDSSigningCertificateErrorCode code, NSS return nil; } if (![self verifyDistinguishedNameOfCertificate:leafCertificateData]) { - OWSFailDebug(@"Leaf certificate has invalid name."); + OWSFailDebugUnlessRunningTests(@"Leaf certificate has invalid name."); *error = CDSSigningCertificateErrorMake( CDSSigningCertificateError_InvalidDistinguishedName, @"Could not extract leaf certificate data."); return nil; @@ -231,7 +231,7 @@ NSError *CDSSigningCertificateErrorMake(CDSSigningCertificateErrorCode code, NSS // necessary. NSData *_Nullable derData = [NSData dataFromBase64String:derString]; if (derData.length < 1) { - OWSFailDebug(@"could not parse PEM match."); + OWSFailDebugUnlessRunningTests(@"could not parse PEM match."); return; } [certificateDatas addObject:derData]; @@ -292,7 +292,7 @@ NSError *CDSSigningCertificateErrorMake(CDSSigningCertificateErrorCode code, NSS BOOL isValid = status == errSecSuccess; if (!isValid) { - OWSFailDebug(@"signatures do not match."); + OWSFailDebugUnlessRunningTests(@"signatures do not match."); return NO; } return YES; @@ -325,7 +325,7 @@ NSError *CDSSigningCertificateErrorMake(CDSSigningCertificateErrorCode code, NSS }; if (![properties isEqualToDictionary:expectedProperties]) { - OWSFailDebug(@"Unexpected certificate properties. %@ != %@", expectedProperties, properties); + OWSFailDebugUnlessRunningTests(@"Unexpected certificate properties. %@ != %@", expectedProperties, properties); return NO; } return YES;