Reenabled key exchange connection limiter test for macos.

pendulum-project · Dec 13, 2024 · 32235c7 · 32235c7
1 parent 72c7cc1
commit 32235c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -42,7 +42,7 @@ jobs:
           - rust: "stable"
             os: macos-latest
             features: "--features run_tokio_rustls_tests"
-            target: "x86_64-apple-darwin"
+            target: "aarch64-apple-darwin"
           - rust: "stable"
             os: ubuntu-latest
             features: "--all-features"
@@ -58,7 +58,7 @@ jobs:
           - rust: "stable"
             os: macos-latest
             features: "--all-features"
-            target: "x86_64-apple-darwin"
+            target: "aarch64-apple-darwin"
           - rust: "stable"
             os: ubuntu-latest
             features: "--no-default-features --features rustls21"

diff --git a/ntpd/src/daemon/keyexchange.rs b/ntpd/src/daemon/keyexchange.rs
@@ -789,7 +789,6 @@ mod tests {
         assert_eq!(len, 16);
     }
 
-    #[cfg(not(target_os = "macos"))]
     #[tokio::test]
     async fn key_exchange_connection_limiter() {
         let port = alloc_port();
@@ -832,7 +831,7 @@ mod tests {
         let ca = include_bytes!("../../test-keys/testca.pem");
 
         assert!(tokio::time::timeout(
-            std::time::Duration::from_millis(200),
+            std::time::Duration::from_millis(750),
             key_exchange_client(
                 "localhost".to_string(),
                 port,
@@ -849,7 +848,7 @@ mod tests {
         drop(blocker);
 
         let result = tokio::time::timeout(
-            std::time::Duration::from_millis(200),
+            std::time::Duration::from_millis(750), // large timeout is needed to ensure test succeeds consistently on MacOS M2 E-cores
             key_exchange_client(
                 "localhost".to_string(),
                 port,