Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reenabled key exchange connection limiter test for macos. #1751

Closed
wants to merge 1 commit into from
Closed

Reenabled key exchange connection limiter test for macos. #1751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/checks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- rust: "stable"
os: macos-latest
features: ""
target: "x86_64-apple-darwin"
target: "aarch64-apple-darwin"
- rust: "stable"
os: ubuntu-latest
features: "--all-features"
Expand All @@ -58,7 +58,7 @@ jobs:
- rust: "stable"
os: macos-latest
features: "--all-features"
target: "x86_64-apple-darwin"
target: "aarch64-apple-darwin"
steps:
- name: Checkout sources
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
Expand Down
5 changes: 2 additions & 3 deletions ntpd/src/daemon/keyexchange.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,6 @@ mod tests {
assert_eq!(len, 16);
}

#[cfg(not(target_os = "macos"))]
#[tokio::test]
async fn key_exchange_connection_limiter() {
let provider = KeySetProvider::new(1);
Expand Down Expand Up @@ -820,7 +819,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(),
5435,
Expand All @@ -837,7 +836,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(),
5435,
Expand Down
Loading