Skip to content

[CPP-231][CPP-236]Fix disabled status_bar/handle_ins_status_test and backend macos benchmark. #76

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

Merged
merged 2 commits into from
Jun 21, 2021
Merged

[CPP-231][CPP-236]Fix disabled status_bar/handle_ins_status_test and backend macos benchmark. #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c44a80
Fix ins_status_test.
john-michaelburke Jun 21, 2021
b346a26
Increase thresholds for macos backend bench.
john-michaelburke Jun 21, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
matrix:
os:
- ubuntu-20.04
# - macos-10.15
- macos-10.15
- windows-2019

runs-on: ${{ matrix.os }}
Expand Down
60 changes: 31 additions & 29 deletions console_backend/src/status_bar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions utils/bench_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,15 @@
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,
},
{
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,
},
Expand Down