Skip to content

Commit 58a0d53

Browse files
Nemo157Joshua Nelson
authored and
Joshua Nelson
committed
Integrate env-logger with the test runners stdout capturing
1 parent f6cd70b commit 58a0d53

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

src/docbuilder/metadata.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ mod test {
216216

217217
#[test]
218218
fn test_cratesfyi_metadata() {
219-
let _ = env_logger::try_init();
219+
crate::test::init_logger();
220220
let manifest = r#"
221221
[package]
222222
name = "test"

src/docbuilder/queue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ mod test {
134134
#[test]
135135
#[ignore]
136136
fn test_get_new_crates() {
137-
let _ = env_logger::try_init();
137+
crate::test::init_logger();
138138
let options = DocBuilderOptions::from_prefix(PathBuf::from("../cratesfyi-prefix"));
139139
let mut docbuilder = DocBuilder::new(options);
140140
let res = docbuilder.get_new_crates();

src/storage/mod.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ impl<'a> From<S3Backend<'a>> for Storage<'a> {
186186

187187
#[cfg(test)]
188188
mod test {
189-
extern crate env_logger;
190189
use super::*;
191190
use crate::test::wrapper;
192191
use std::env;
@@ -290,8 +289,7 @@ mod test {
290289

291290
#[test]
292291
fn test_get_file_list() {
293-
let _ = env_logger::try_init();
294-
292+
crate::test::init_logger();
295293
let files = get_file_list(env::current_dir().unwrap());
296294
assert!(files.is_ok());
297295
assert!(files.unwrap().len() > 0);

src/test/mod.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,14 @@ pub(crate) struct TestEnvironment {
9393
s3: OnceCell<TestS3>,
9494
}
9595

96+
pub(crate) fn init_logger() {
97+
// If this fails it's probably already initialized
98+
let _ = env_logger::builder().is_test(true).try_init();
99+
}
100+
96101
impl TestEnvironment {
97102
fn new() -> Self {
98-
// If this fails it's probably already initialized
99-
let _ = env_logger::try_init();
103+
init_logger();
100104
Self {
101105
db: OnceCell::new(),
102106
frontend: OnceCell::new(),

src/utils/github_updater.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ mod test {
181181
#[test]
182182
#[ignore]
183183
fn test_get_github_fields() {
184-
let _ = env_logger::try_init();
185184
let fields = get_github_fields("onur/cratesfyi");
186185
assert!(fields.is_ok());
187186

@@ -198,7 +197,7 @@ mod test {
198197
#[test]
199198
#[ignore]
200199
fn test_github_updater() {
201-
let _ = env_logger::try_init();
200+
crate::test::init_logger();
202201
assert!(github_updater().is_ok());
203202
}
204203
}

src/utils/release_activity_updater.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ mod test {
7676
#[test]
7777
#[ignore]
7878
fn test_update_release_activity() {
79-
let _ = env_logger::try_init();
79+
crate::test::init_logger();
8080
assert!(update_release_activity().is_ok());
8181
}
8282
}

0 commit comments

Comments
 (0)