Skip to content

Commit f075022

Browse files
committed
fix: use info level maximum in test that needs to check logs
slog remove trace and debug level logs at compile time when targeting release. This means that we should at maximum use info level for logs that are checked in tests else those tests would fail if run with `--release` (such as in the hydra ci).
1 parent 3c8c771 commit f075022

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

mithril-client/Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ mithril-common = { path = "../mithril-common", version = "=0.5", default-feature
7272
] }
7373
mockall = { workspace = true }
7474
sha2 = "0.10.8"
75-
slog = { workspace = true, features = [
76-
"max_level_trace",
77-
"release_max_level_warn",
78-
] }
7975
slog-async = { workspace = true }
8076
slog-term = { workspace = true }
8177
tokio = { workspace = true, features = ["macros"] }

mithril-common/src/test_utils/memory_logger.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ impl slog::Serializer for KVSerializer {
120120

121121
#[cfg(test)]
122122
mod tests {
123-
use slog::debug;
123+
use slog::info;
124124

125125
use super::*;
126126

@@ -130,11 +130,11 @@ mod tests {
130130
let logger = slog::Logger::root(drain.clone().fuse(), slog::o!("shared" => "shared"));
131131

132132
// Note: keys seem to be logged in invert order
133-
debug!(logger, "test format"; "key_3" => "value three", "key_2" => "value two", "key_1" => "value one");
133+
info!(logger, "test format"; "key_3" => "value three", "key_2" => "value two", "key_1" => "value one");
134134

135135
let results = log_inspector.search_logs("test format");
136136
assert_eq!(
137-
"DEBUG test format; key_1=value one, key_2=value two, key_3=value three, shared=shared",
137+
"INFO test format; key_1=value one, key_2=value two, key_3=value three, shared=shared",
138138
results[0]
139139
);
140140
}
@@ -144,13 +144,13 @@ mod tests {
144144
let (drain, log_inspector) = MemoryDrainForTest::new();
145145
let logger = slog::Logger::root(drain.fuse(), slog::o!());
146146

147-
debug!(logger, "message one"; "key" => "value1");
148-
debug!(logger, "message two"; "key" => "value2");
147+
info!(logger, "message one"; "key" => "value1");
148+
info!(logger, "message two"; "key" => "value2");
149149

150150
let display = format!("{log_inspector}");
151151
assert_eq!(
152152
display,
153-
"DEBUG message one; key=value1\nDEBUG message two; key=value2"
153+
"INFO message one; key=value1\nINFO message two; key=value2"
154154
);
155155
}
156156

@@ -159,8 +159,8 @@ mod tests {
159159
let (drain, log_inspector) = MemoryDrainForTest::new();
160160
let logger = slog::Logger::root(drain.clone().fuse(), slog::o!());
161161

162-
debug!(logger, "test message"; "key" => "value");
163-
debug!(logger, "another message"; "key2" => "value2");
162+
info!(logger, "test message"; "key" => "value");
163+
info!(logger, "another message"; "key2" => "value2");
164164

165165
let results = log_inspector.search_logs("test");
166166
assert_eq!(results.len(), 1);
@@ -176,11 +176,11 @@ mod tests {
176176

177177
let handle1 = tokio::spawn(async move {
178178
let logger = slog::Logger::root(drain_clone1.fuse(), slog::o!());
179-
debug!(logger, "async test 1"; "key" => "value");
179+
info!(logger, "async test 1"; "key" => "value");
180180
});
181181
let handle2 = tokio::spawn(async move {
182182
let logger = slog::Logger::root(drain_clone2.fuse(), slog::o!());
183-
debug!(logger, "async test 2"; "key" => "value");
183+
info!(logger, "async test 2"; "key" => "value");
184184
});
185185

186186
handle1.await.unwrap();
@@ -201,7 +201,7 @@ mod tests {
201201
let drain_clone = drain.clone();
202202
join_set.spawn(async move {
203203
let logger = slog::Logger::root(drain_clone.fuse(), slog::o!());
204-
debug!(logger, "multi thread test {i}"; "thread_id" => i);
204+
info!(logger, "multi thread test {i}"; "thread_id" => i);
205205
});
206206
}
207207

0 commit comments

Comments
 (0)