Skip to content

Commit cf55867

Browse files
committed
primitives - fix local postgres test setup
- sentry - db - add assertions for pool
1 parent dc13f57 commit cf55867

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

primitives/src/util/tests/prep_db.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,10 @@ pub mod postgres {
253253
.host(&POSTGRES_HOST)
254254
.port(*POSTGRES_PORT);
255255

256+
if let Some(db) = POSTGRES_DB.as_ref() {
257+
config.dbname(db);
258+
}
259+
256260
let mgr_config = ManagerConfig {
257261
recycling_method: RecyclingMethod::Fast,
258262
};

sentry/src/db.rs

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,12 @@ pub mod tests_postgres {
145145
};
146146

147147
use deadpool::managed::{Manager as ManagerTrait, RecycleResult};
148-
use deadpool_postgres::{ManagerConfig, PoolError};
148+
use deadpool_postgres::ManagerConfig;
149149
use tokio_postgres::{NoTls, SimpleQueryMessage};
150150

151151
use async_trait::async_trait;
152152

153-
use super::DbPool;
153+
use super::{DbPool, PoolError};
154154

155155
pub type Pool = deadpool::managed::Pool<Database, PoolError>;
156156

@@ -239,12 +239,19 @@ pub mod tests_postgres {
239239
let created_db = format!("CREATE DATABASE {0};", db_name);
240240
let temp_client = self.base_pool.get().await?;
241241

242-
temp_client.execute(drop_db.as_str(), &[]).await?;
243-
temp_client.execute(created_db.as_str(), &[]).await?;
244-
245-
// assert_eq!(2, result.len());
246-
// assert!(matches!(result[0], SimpleQueryMessage::CommandComplete(..)));
247-
// assert!(matches!(result[1], SimpleQueryMessage::CommandComplete(..)));
242+
let drop_db_result = temp_client.simple_query(drop_db.as_str()).await?;
243+
assert_eq!(1, drop_db_result.len());
244+
assert!(matches!(
245+
drop_db_result[0],
246+
SimpleQueryMessage::CommandComplete(..)
247+
));
248+
249+
let create_db_result = temp_client.simple_query(created_db.as_str()).await?;
250+
assert_eq!(1, create_db_result.len());
251+
assert!(matches!(
252+
create_db_result[0],
253+
SimpleQueryMessage::CommandComplete(..)
254+
));
248255

249256
let mut config = self.base_config.clone();
250257
// set the database in the configuration of the inside Pool (used for tests)

0 commit comments

Comments
 (0)