From 6eaa3f46a2876e6af9826e5305915521cbdb85b4 Mon Sep 17 00:00:00 2001
From: cnkwocha <ci_nkwocha@apple.com>
Date: Wed, 11 Dec 2024 15:11:39 +0000
Subject: [PATCH] Fix flaky test `CertificateTests.testCertificateDescription`

Motivation:

The test fails when the local machine is not set to 24-hour time.

Modifications:

- Adjust the test to use dynamic time values based on Foundation's `Date` instead of hard-coded time strings.

Result:

A non-flaky test.
---
 Tests/X509Tests/CertificateTests.swift | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/Tests/X509Tests/CertificateTests.swift b/Tests/X509Tests/CertificateTests.swift
index 52d8fda..aac4ba8 100644
--- a/Tests/X509Tests/CertificateTests.swift
+++ b/Tests/X509Tests/CertificateTests.swift
@@ -533,13 +533,16 @@ final class CertificateTests: XCTestCase {
             OrganizationName("Apple")
             CommonName("Swift Certificate Test Intermediate CA 1")
         }
+        let intermediateNotValidBefore = Self.referenceTime - .days(365)
+        let intermediateNotValidAfter = Self.referenceTime + .days(5 * 365)
+
         let intermediate: Certificate = {
             return try! Certificate(
                 version: .v3,
                 serialNumber: .init(bytes: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]),
                 publicKey: .init(intermediatePrivateKey.publicKey),
-                notValidBefore: Self.referenceTime - .days(365),
-                notValidAfter: Self.referenceTime + .days(5 * 365),
+                notValidBefore: intermediateNotValidBefore,
+                notValidAfter: intermediateNotValidAfter,
                 issuer: ca.subject,
                 subject: intermediateName,
                 signatureAlgorithm: .ecdsaWithSHA384,
@@ -577,8 +580,8 @@ final class CertificateTests: XCTestCase {
             serialNumber: 1:2:3:4:5:6:7:8:9:a:b, \
             issuer: "CN=Swift Certificate Test CA 1,O=Apple,C=US", \
             subject: "CN=Swift Certificate Test Intermediate CA 1,O=Apple,C=US", \
-            notValidBefore: 2022-08-08 14:26:14 +0000, \
-            notValidAfter: 2028-08-06 14:26:14 +0000, \
+            notValidBefore: \(String(reflecting: intermediateNotValidBefore)), \
+            notValidAfter: \(String(reflecting: intermediateNotValidAfter)), \
             publicKey: P256.PublicKey, \
             signature: ECDSA, \
             extensions: [\
@@ -595,12 +598,15 @@ final class CertificateTests: XCTestCase {
         )
 
         let localhostPrivateKey = P256.Signing.PrivateKey()
+        let leafNotValidBefore = Self.referenceTime - .days(365)
+        let leafNotValidAfter = Self.referenceTime + .days(365)
+
         let leaf = try Certificate(
             version: .v3,
             serialNumber: .init(bytes: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]),
             publicKey: .init(localhostPrivateKey.publicKey),
-            notValidBefore: Self.referenceTime - .days(365),
-            notValidAfter: Self.referenceTime + .days(365),
+            notValidBefore: leafNotValidBefore,
+            notValidAfter: leafNotValidAfter,
             issuer: intermediateName,
             subject: try DistinguishedName {
                 CountryName("US")
@@ -627,8 +633,8 @@ final class CertificateTests: XCTestCase {
             serialNumber: 1:2:3:4:5:6:7:8:9:a:b:c, \
             issuer: "CN=Swift Certificate Test Intermediate CA 1,O=Apple,C=US", \
             subject: "STREET=Infinite Loop,CN=localhost,O=Apple,C=US", \
-            notValidBefore: 2022-08-08 14:26:14 +0000, \
-            notValidAfter: 2024-08-07 14:26:14 +0000, \
+            notValidBefore: \(String(reflecting: leafNotValidBefore)), \
+            notValidAfter: \(String(reflecting: leafNotValidAfter)), \
             publicKey: P256.PublicKey, \
             signature: ECDSA, \
             extensions: [\