Turbo/lf9-pgg
9
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

refactor: replace println with debug logging in tests for better log management

Browse source
This commit is contained in:
Mika 2025-06-17 14:02:29 +02:00
parent e383615150
commit 5094b3cb46
2 changed files with 22 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
crates/backend/tests/common/mod.rs
View file

@ -1,6 +1,10 @@
use backend::{Database, build_database_url}; use backend::{Database, build_database_url};
use log::{debug, info};
use migration::{Migrator, MigratorTrait}; use migration::{Migrator, MigratorTrait};
use testcontainers::{ContainerAsync, ImageExt, runners::AsyncRunner}; use testcontainers::{
ContainerAsync, ImageExt, core::logs::consumer::logging_consumer::LoggingConsumer,
runners::AsyncRunner,
};
use testcontainers_modules::{postgres::Postgres, redis::Redis}; use testcontainers_modules::{postgres::Postgres, redis::Redis};
pub mod test_helpers; pub mod test_helpers;
@ -22,8 +26,8 @@ pub async fn setup() -> (ContainerAsync<Postgres>, ContainerAsync<Redis>, Databa
let postgres_port = postgres.get_host_port_ipv4(5432).await.unwrap(); let postgres_port = postgres.get_host_port_ipv4(5432).await.unwrap();
let redis_port = redis.get_host_port_ipv4(6379).await.unwrap(); let redis_port = redis.get_host_port_ipv4(6379).await.unwrap();
println!("PostgreSQL container started on port: {}", postgres_port); debug!("PostgreSQL container started on port: {}", postgres_port);
println!("Redis container started on port: {}", redis_port); debug!("Redis container started on port: {}", redis_port);
// Wait for PostgreSQL to be ready // Wait for PostgreSQL to be ready
wait_for_postgres_ready(&postgres).await; wait_for_postgres_ready(&postgres).await;
@ -39,7 +43,7 @@ pub async fn setup() -> (ContainerAsync<Postgres>, ContainerAsync<Redis>, Databa
} }
let database_url = build_database_url(); let database_url = build_database_url();
println!("Database URL: {}", database_url); info!("Database URL: {}", database_url);
let database = Database::new(database_url.into()).await.unwrap(); let database = Database::new(database_url.into()).await.unwrap();
@ -49,32 +53,22 @@ pub async fn setup() -> (ContainerAsync<Postgres>, ContainerAsync<Redis>, Databa
} }
async fn wait_for_postgres_ready(container: &ContainerAsync<Postgres>) { async fn wait_for_postgres_ready(container: &ContainerAsync<Postgres>) {
use sea_orm::{Database as SeaOrmDatabase, DbErr}; info!("Waiting for PostgreSQL to be ready...");
println!("Waiting for PostgreSQL to be ready...");
let postgres_port = container.get_host_port_ipv4(5432).await.unwrap();
let connection_string = format!(
"postgresql://postgres:postgres@127.0.0.1:{}/test_db",
postgres_port
);
for attempt in 1..=30 { for attempt in 1..=30 {
match SeaOrmDatabase::connect(&connection_string).await { match container.stdout_to_vec().await {
Ok(conn) => match conn.ping().await { Ok(logs) => {
Ok(_) => { let log_string = String::from_utf8_lossy(&logs);
println!("PostgreSQL is ready after {} attempts", attempt);
if log_string.contains("database system is ready to accept connections") {
info!("PostgreSQL is ready after {} attempts", attempt);
return; return;
} }
Err(_) => {
println!("Attempt {}: PostgreSQL connection failed ping", attempt); debug!("Attempt {}: PostgreSQL not ready yet", attempt);
} }
}, Err(e) => {
Err(DbErr::Conn(_)) => { debug!("Attempt {}: Failed to read logs: {}", attempt, e);
println!("Attempt {}: PostgreSQL connection refused", attempt);
}
Err(_) => {
println!("Attempt {}: PostgreSQL other error", attempt);
} }
} }

5
crates/backend/tests/endpoints/auth.rs
View file

@ -6,6 +6,7 @@ use crate::common::test_helpers::get_database;
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use log::debug;
use serde_json::json; use serde_json::json;
use super::*; use super::*;
@ -46,8 +47,8 @@ mod tests {
let body = test::read_body(req).await; let body = test::read_body(req).await;
let body_str = String::from_utf8_lossy(&body); let body_str = String::from_utf8_lossy(&body);
println!("Response status: {}", status); debug!("Response status: {}", status);
println!("Response body: {}", body_str); debug!("Response body: {}", body_str);
assert!(status.is_success() || status.is_client_error()); assert!(status.is_success() || status.is_client_error());
} }