Skip to content

Commit d416977

Browse files
committed
Re-add timeouts
Signed-off-by: Heinz N. Gies <heinz@licenser.net>
1 parent e01c8db commit d416977

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

serial_test/src/code_lock.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ use dashmap::{try_result::TryResult, DashMap};
33
use lazy_static::lazy_static;
44
#[cfg(all(feature = "logging"))]
55
use log::debug;
6-
use std::sync::{atomic::AtomicU32, Arc};
7-
use std::time::Duration;
8-
use std::time::Instant;
6+
use std::{
7+
sync::{atomic::AtomicU32, Arc},
8+
time::{Duration, Instant},
9+
};
910

1011
pub(crate) struct UniqueReentrantMutex {
1112
locks: Locks,

serial_test_test/src/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,11 @@ mod tests {
107107
use serial_test::{file_parallel, file_serial};
108108

109109
#[test]
110-
#[serial()]
110+
#[serial(timeout_key, timeout_ms = 60000)]
111111
fn demo_timeout_with_key() {}
112112

113113
#[test]
114-
#[serial()]
115-
// #[serial(timeout_ms = 60000)]
114+
#[serial(timeout_ms = 60000)]
116115
fn demo_timeout() {}
117116

118117
#[test]

0 commit comments

Comments
 (0)