diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 19288237b..ef1846ca0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: matrix: os: - ubuntu-20.04 - # - macos-10.15 + - macos-10.15 - windows-2019 runs-on: ${{ matrix.os }} diff --git a/console_backend/src/status_bar.rs b/console_backend/src/status_bar.rs index 2ff48afa6..d39c080eb 100644 --- a/console_backend/src/status_bar.rs +++ b/console_backend/src/status_bar.rs @@ -516,6 +516,7 @@ impl Clone for Heartbeat { mod tests { use super::*; use crate::types::TestSender; + const DELAY_BUFFER_MS: u64 = 10; #[test] fn handle_age_corrections_test() { @@ -565,35 +566,36 @@ mod tests { } } - // #[test] - // fn handle_ins_status_test() { - // let shared_state = SharedState::new(); - // let client_send = TestSender { inner: Vec::new() }; - // let mut status_bar = StatusBar::new(shared_state, client_send); - // let flags = 0xf0_u32; - // let msg = MsgInsStatus { - // sender_id: Some(1337), - // flags, - // }; - // let update_time = Instant::now(); - // status_bar.handle_ins_status(msg); - // let last_ins_status_receipt_time = { - // let shared_data = status_bar - // .heartbeat_data - // .lock() - // .expect(HEARTBEAT_LOCK_MUTEX_FAILURE); - // (*shared_data).last_ins_status_receipt_time - // }; - // assert!(last_ins_status_receipt_time.unwrap() > update_time); - // let ins_status_flags = { - // let shared_data = status_bar - // .heartbeat_data - // .lock() - // .expect(HEARTBEAT_LOCK_MUTEX_FAILURE); - // (*shared_data).ins_status_flags - // }; - // assert_eq!(ins_status_flags, flags); - // } + #[test] + fn handle_ins_status_test() { + let shared_state = SharedState::new(); + let client_send = TestSender { inner: Vec::new() }; + let mut status_bar = StatusBar::new(shared_state, client_send); + let flags = 0xf0_u32; + let msg = MsgInsStatus { + sender_id: Some(1337), + flags, + }; + let update_time = Instant::now(); + sleep(Duration::from_millis(DELAY_BUFFER_MS)); + status_bar.handle_ins_status(msg); + let last_ins_status_receipt_time = { + let shared_data = status_bar + .heartbeat_data + .lock() + .expect(HEARTBEAT_LOCK_MUTEX_FAILURE); + (*shared_data).last_ins_status_receipt_time + }; + assert!(last_ins_status_receipt_time.unwrap() > update_time); + let ins_status_flags = { + let shared_data = status_bar + .heartbeat_data + .lock() + .expect(HEARTBEAT_LOCK_MUTEX_FAILURE); + (*shared_data).ins_status_flags + }; + assert_eq!(ins_status_flags, flags); + } #[test] fn handle_ins_updates_test() { diff --git a/utils/bench_runner.py b/utils/bench_runner.py index 564a4a95e..2afe3ee8e 100644 --- a/utils/bench_runner.py +++ b/utils/bench_runner.py @@ -77,7 +77,7 @@ NAME: "piksi-relay.sbp", FILE_PATH: "target/criterion/proc_messages/RPM_success/base/estimates.json", KEY_LOCATION: "mean.point_estimate", - EXPECTED: 77500000, + EXPECTED: 90000000, ERROR_MARGIN_FRAC: 0.05, SUCCESS: True, }, @@ -85,7 +85,7 @@ NAME: "piksi-relay.sbp", FILE_PATH: "target/criterion/proc_messages/RPM_failure/base/estimates.json", KEY_LOCATION: "mean.point_estimate", - EXPECTED: 77500000, + EXPECTED: 110000000, ERROR_MARGIN_FRAC: 0.05, SUCCESS: False, },