Skip to content

Commit 1d3e8db

Browse files
committed
merge tests with set_default
1 parent 1b0d66e commit 1d3e8db

File tree

2 files changed

+31
-39
lines changed

2 files changed

+31
-39
lines changed

tracing/tests/enabled.rs

+31-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,39 @@ fn level_and_target() {
2121
.done()
2222
.run();
2323

24-
tracing::collect::set_global_default(collector).unwrap();
24+
let _guard = tracing::collect::set_default(collector);
2525

2626
assert!(tracing::enabled!(target: "debug_module", Level::DEBUG));
2727
assert!(tracing::enabled!(Level::ERROR));
2828
assert!(!tracing::enabled!(Level::DEBUG));
2929
}
30+
31+
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
32+
#[test]
33+
fn span_and_event() {
34+
let collector = collector::mock()
35+
.with_filter(|meta| {
36+
if meta.target() == "debug_module" {
37+
meta.level() <= &Level::DEBUG
38+
} else if meta.is_span() {
39+
meta.level() <= &Level::TRACE
40+
} else if meta.is_event() {
41+
meta.level() <= &Level::DEBUG
42+
} else {
43+
meta.level() <= &Level::INFO
44+
}
45+
})
46+
.done()
47+
.run();
48+
49+
let _guard = tracing::collect::set_default(collector);
50+
51+
// Ensure that the `_event` and `_span` alternatives work corretly
52+
assert!(!tracing::event_enabled!(Level::TRACE));
53+
assert!(tracing::event_enabled!(Level::DEBUG));
54+
assert!(tracing::span_enabled!(Level::TRACE));
55+
56+
// target variants
57+
assert!(tracing::span_enabled!(target: "debug_module", Level::DEBUG));
58+
assert!(tracing::event_enabled!(target: "debug_module", Level::DEBUG));
59+
}

tracing/tests/specific_enabled.rs

-38
This file was deleted.

0 commit comments

Comments
 (0)