Skip to content

Commit 79ea3cb

Browse files
committed
[eclipse-iceoryx#139] Merge current main
1 parent e6c5133 commit 79ea3cb

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

iceoryx2-bb/posix/tests/semaphore_tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ fn wait_blocks<T: SemaphoreInterface + Send + Sync>(sut1: &T, sut2: &T) {
300300
thread::scope(|s| {
301301
let t = s.spawn(|| {
302302
barrier.wait();
303-
sut1.wait().unwrap();
303+
sut1.blocking_wait().unwrap();
304304
counter.fetch_add(1, Ordering::Relaxed);
305305
});
306306

iceoryx2-cal/tests/event_signal_mechanism_tests.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ mod signal_mechanism {
2424

2525
#[test]
2626
fn notified_signal_does_not_block<Sut: SignalMechanism>() {
27-
let _watchdog = Watchdog::new(Duration::from_secs(1));
27+
let _watchdog = Watchdog::new();
2828
let mut sut = Sut::new();
2929
unsafe {
3030
assert_that!(sut.init(), is_ok);
@@ -54,7 +54,7 @@ mod signal_mechanism {
5454
}
5555

5656
fn wait_blocks<Sut: SignalMechanism, F: FnOnce(&Sut) -> bool + Send>(wait_call: F) {
57-
let _watchdog = Watchdog::new(Duration::from_secs(1));
57+
let _watchdog = Watchdog::new();
5858
let mut sut = Sut::new();
5959
let barrier = Barrier::new(2);
6060
let counter = AtomicU64::new(0);
@@ -95,7 +95,7 @@ mod signal_mechanism {
9595

9696
#[test]
9797
fn timed_wait_blocks_at_least_for_timeout<Sut: SignalMechanism>() {
98-
let _watchdog = Watchdog::new(Duration::from_secs(1));
98+
let _watchdog = Watchdog::new();
9999
let mut sut = Sut::new();
100100
unsafe {
101101
assert_that!(sut.init(), is_ok);

iceoryx2-cal/tests/event_tests.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ mod event {
9090
>(
9191
wait_call: F,
9292
) {
93-
let _watchdog = Watchdog::new(Duration::from_secs(1));
93+
let _watchdog = Watchdog::new();
9494
const REPETITIONS: u64 = 32;
9595
let name = generate_name();
9696

@@ -243,7 +243,7 @@ mod event {
243243

244244
#[test]
245245
fn blocking_wait_blocks_until_notification_arrives<Sut: Event>() {
246-
let _watchdog = Watchdog::new(Duration::from_secs(1));
246+
let _watchdog = Watchdog::new();
247247
let name = generate_name();
248248

249249
let counter = AtomicU64::new(0);
@@ -276,7 +276,7 @@ mod event {
276276
#[cfg(not(target_os = "windows"))]
277277
#[test]
278278
fn timed_wait_blocks_until_notification_arrives<Sut: Event>() {
279-
let _watchdog = Watchdog::new(Duration::from_secs(1));
279+
let _watchdog = Watchdog::new();
280280
let name = generate_name();
281281

282282
let counter = AtomicU64::new(0);

0 commit comments

Comments
 (0)