Skip to content

Commit

Permalink
merge tests with set_default
Browse files Browse the repository at this point in the history
  • Loading branch information
guswynn committed Feb 9, 2022
1 parent 1b0d66e commit 87eac2e
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 39 deletions.
32 changes: 31 additions & 1 deletion tracing/tests/enabled.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,39 @@ fn level_and_target() {
.done()
.run();

tracing::collect::set_global_default(collector).unwrap();
let _guard = tracing::collect::set_default(collector);

assert!(tracing::enabled!(target: "debug_module", Level::DEBUG));
assert!(tracing::enabled!(Level::ERROR));
assert!(!tracing::enabled!(Level::DEBUG));
}

#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
#[test]
fn span_and_event() {
let collector = collector::mock()
.with_filter(|meta| {
if meta.target() == "debug_module" {
meta.level() <= &Level::DEBUG
} else if meta.is_span() {
meta.level() <= &Level::TRACE
} else if meta.is_event() {
meta.level() <= &Level::DEBUG
} else {
meta.level() <= &Level::INFO
}
})
.done()
.run();

let _guard = tracing::collect::set_default(collector);

// Ensure that the `_event` and `_span` alternatives work corretly
assert!(!tracing::event_enabled!(Level::TRACE));
assert!(tracing::event_enabled!(Level::DEBUG));
assert!(tracing::span_enabled!(Level::TRACE));

// target variants
assert!(tracing::span_enabled!(target: "debug_module", Level::DEBUG));
assert!(tracing::event_enabled!(target: "debug_module", Level::DEBUG));
}
38 changes: 0 additions & 38 deletions tracing/tests/specific_enabled.rs

This file was deleted.

0 comments on commit 87eac2e

Please sign in to comment.