From d416977f26982a3486a45a36aa991fa3ec741be1 Mon Sep 17 00:00:00 2001 From: "Heinz N. Gies" Date: Mon, 25 Jul 2022 10:37:13 +0200 Subject: [PATCH] Re-add timeouts Signed-off-by: Heinz N. Gies --- serial_test/src/code_lock.rs | 7 ++++--- serial_test_test/src/lib.rs | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/serial_test/src/code_lock.rs b/serial_test/src/code_lock.rs index 52444fb..ebd728b 100644 --- a/serial_test/src/code_lock.rs +++ b/serial_test/src/code_lock.rs @@ -3,9 +3,10 @@ use dashmap::{try_result::TryResult, DashMap}; use lazy_static::lazy_static; #[cfg(all(feature = "logging"))] use log::debug; -use std::sync::{atomic::AtomicU32, Arc}; -use std::time::Duration; -use std::time::Instant; +use std::{ + sync::{atomic::AtomicU32, Arc}, + time::{Duration, Instant}, +}; pub(crate) struct UniqueReentrantMutex { locks: Locks, diff --git a/serial_test_test/src/lib.rs b/serial_test_test/src/lib.rs index 9b674e6..edf84d5 100644 --- a/serial_test_test/src/lib.rs +++ b/serial_test_test/src/lib.rs @@ -107,12 +107,11 @@ mod tests { use serial_test::{file_parallel, file_serial}; #[test] - #[serial()] + #[serial(timeout_key, timeout_ms = 60000)] fn demo_timeout_with_key() {} #[test] - #[serial()] - // #[serial(timeout_ms = 60000)] + #[serial(timeout_ms = 60000)] fn demo_timeout() {} #[test]