Skip to content

Commit 24349a4

Browse files
im-0im-0
committed
tests: Use SerialBaudRate::R1228800Bd as it is more stable
1 parent 3b5e803 commit 24349a4

File tree

3 files changed

+75
-4
lines changed

3 files changed

+75
-4
lines changed

‎lib/src/tests/mod.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ use crate::*;
1111
mod sync;
1212
mod tokio;
1313

14+
const SERIAL_BAUD_RATE_DEFAULT: SerialBaudRate = SerialBaudRate::R2000000Bd;
15+
const SERIAL_BAUD_RATE_STABLE: SerialBaudRate = SerialBaudRate::R1228800Bd;
16+
1417
fn initialize_test() -> Result<(String, Option<String>, bool)> {
1518
// Configure logging.
1619
static CONFIGURE_LOGGING_ONCE: Once = Once::new();

‎lib/src/tests/sync.rs‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ use embedded_can::{ExtendedId, Frame as _, Id, StandardId};
44
use tracing::info;
55

66
use crate::sync::Usb2CanBuilder;
7-
use crate::tests::{initialize_test, invert_frame};
7+
use crate::tests::{
8+
initialize_test, invert_frame, SERIAL_BAUD_RATE_DEFAULT, SERIAL_BAUD_RATE_STABLE,
9+
};
810
use crate::{
911
sync::Usb2Can, CanBaudRate, Frame, SerialBaudRate, StoredIdFilter, Usb2CanConfiguration,
1012
};
@@ -25,6 +27,13 @@ fn stored_id_filter() -> Result<()> {
2527
let (mut usb2can_a, mut usb2can_b) =
2628
open_adapters(&serial_path, &second_serial_path, &usb2can_conf)?;
2729

30+
info!("Configure to the stable serial baud rate value...");
31+
reconfigure_adapters(&mut usb2can_a, &mut usb2can_b, |usb2can| {
32+
usb2can
33+
.set_serial_baud_rate(SERIAL_BAUD_RATE_STABLE)
34+
.context("Failed to set serial baud rate of USB2CAN device to stable value")
35+
})?;
36+
2837
// Blocklist filter.
2938
let filter = StoredIdFilter::new_block(vec![ExtendedId::ZERO.into()])
3039
.context("Failed to create blocklist filter")?;
@@ -63,6 +72,13 @@ fn stored_id_filter() -> Result<()> {
6372

6473
self_test(&mut usb2can_a, &mut usb2can_b, false, true)?;
6574

75+
info!("Resetting to the original serial baud rate value...");
76+
reconfigure_adapters(&mut usb2can_a, &mut usb2can_b, |usb2can| {
77+
usb2can
78+
.set_serial_baud_rate(SERIAL_BAUD_RATE_DEFAULT)
79+
.context("Failed to set serial baud rate of USB2CAN device to original value")
80+
})?;
81+
6682
Ok(())
6783
}
6884

@@ -82,6 +98,13 @@ fn can_rates_frame_types_and_filtering() -> Result<()> {
8298
let (mut usb2can_a, mut usb2can_b) =
8399
open_adapters(&serial_path, &second_serial_path, &usb2can_conf)?;
84100

101+
info!("Configure to the stable serial baud rate value...");
102+
reconfigure_adapters(&mut usb2can_a, &mut usb2can_b, |usb2can| {
103+
usb2can
104+
.set_serial_baud_rate(SERIAL_BAUD_RATE_STABLE)
105+
.context("Failed to set serial baud rate of USB2CAN device to stable value")
106+
})?;
107+
85108
for variable_encoding in [false, true] {
86109
for can_baud_rate in [
87110
CanBaudRate::R5kBd,
@@ -156,6 +179,13 @@ fn can_rates_frame_types_and_filtering() -> Result<()> {
156179
}
157180
}
158181

182+
info!("Resetting to the original serial baud rate value...");
183+
reconfigure_adapters(&mut usb2can_a, &mut usb2can_b, |usb2can| {
184+
usb2can
185+
.set_serial_baud_rate(SERIAL_BAUD_RATE_DEFAULT)
186+
.context("Failed to set serial baud rate of USB2CAN device to original value")
187+
})?;
188+
159189
Ok(())
160190
}
161191

@@ -200,7 +230,7 @@ fn serial_rates() -> Result<()> {
200230
info!("Resetting to the original serial baud rate value...");
201231
reconfigure_adapters(&mut usb2can_a, &mut usb2can_b, |usb2can| {
202232
usb2can
203-
.set_serial_baud_rate(SerialBaudRate::R2000000Bd)
233+
.set_serial_baud_rate(SERIAL_BAUD_RATE_DEFAULT)
204234
.context("Failed to set serial baud rate of USB2CAN device to original value")
205235
})?;
206236

‎lib/src/tests/tokio.rs‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ use embedded_can::{ExtendedId, Frame as _, Id, StandardId};
55
use tokio::try_join;
66
use tracing::info;
77

8-
use crate::tests::{initialize_test, invert_frame};
8+
use crate::tests::{
9+
initialize_test, invert_frame, SERIAL_BAUD_RATE_DEFAULT, SERIAL_BAUD_RATE_STABLE,
10+
};
911
use crate::tokio::Usb2CanBuilder;
1012
use crate::{
1113
tokio::Usb2Can, CanBaudRate, Frame, SerialBaudRate, StoredIdFilter, Usb2CanConfiguration,
@@ -27,6 +29,15 @@ async fn stored_id_filter() -> Result<()> {
2729
let (mut usb2can_a, mut usb2can_b) =
2830
open_adapters(&serial_path, &second_serial_path, &usb2can_conf).await?;
2931

32+
info!("Configure to the stable serial baud rate value...");
33+
reconfigure_adapters(&mut usb2can_a, &mut usb2can_b, |usb2can| async {
34+
usb2can
35+
.set_serial_baud_rate(SERIAL_BAUD_RATE_STABLE)
36+
.await
37+
.context("Failed to set serial baud rate of USB2CAN device to stable value")
38+
})
39+
.await?;
40+
3041
// Blocklist filter.
3142
let filter = StoredIdFilter::new_block(vec![ExtendedId::ZERO.into()])
3243
.context("Failed to create blocklist filter")?;
@@ -71,6 +82,15 @@ async fn stored_id_filter() -> Result<()> {
7182

7283
self_test(&mut usb2can_a, &mut usb2can_b, false, true).await?;
7384

85+
info!("Resetting to the original serial baud rate value...");
86+
reconfigure_adapters(&mut usb2can_a, &mut usb2can_b, |usb2can| async {
87+
usb2can
88+
.set_serial_baud_rate(SERIAL_BAUD_RATE_DEFAULT)
89+
.await
90+
.context("Failed to set serial baud rate of USB2CAN device to original value")
91+
})
92+
.await?;
93+
7494
Ok(())
7595
}
7696

@@ -90,6 +110,15 @@ async fn can_rates_frame_types_and_filtering() -> Result<()> {
90110
let (mut usb2can_a, mut usb2can_b) =
91111
open_adapters(&serial_path, &second_serial_path, &usb2can_conf).await?;
92112

113+
info!("Configure to the stable serial baud rate value...");
114+
reconfigure_adapters(&mut usb2can_a, &mut usb2can_b, |usb2can| async {
115+
usb2can
116+
.set_serial_baud_rate(SERIAL_BAUD_RATE_STABLE)
117+
.await
118+
.context("Failed to set serial baud rate of USB2CAN device to stable value")
119+
})
120+
.await?;
121+
93122
for variable_encoding in [false, true] {
94123
for can_baud_rate in [
95124
CanBaudRate::R5kBd,
@@ -167,6 +196,15 @@ async fn can_rates_frame_types_and_filtering() -> Result<()> {
167196
}
168197
}
169198

199+
info!("Resetting to the original serial baud rate value...");
200+
reconfigure_adapters(&mut usb2can_a, &mut usb2can_b, |usb2can| async {
201+
usb2can
202+
.set_serial_baud_rate(SERIAL_BAUD_RATE_DEFAULT)
203+
.await
204+
.context("Failed to set serial baud rate of USB2CAN device to original value")
205+
})
206+
.await?;
207+
170208
Ok(())
171209
}
172210

@@ -213,7 +251,7 @@ async fn serial_rates() -> Result<()> {
213251
info!("Resetting to the original serial baud rate value...");
214252
reconfigure_adapters(&mut usb2can_a, &mut usb2can_b, |usb2can| async {
215253
usb2can
216-
.set_serial_baud_rate(SerialBaudRate::R2000000Bd)
254+
.set_serial_baud_rate(SERIAL_BAUD_RATE_DEFAULT)
217255
.await
218256
.context("Failed to set serial baud rate of USB2CAN device to original value")
219257
})

0 commit comments

Comments
 (0)