Skip to content

Commit a87037e

Browse files
committed
worker/tests: Use connection pool for test connection
1 parent f04551d commit a87037e

File tree

1 file changed

+11
-21
lines changed

1 file changed

+11
-21
lines changed

crates/crates_io_worker/tests/runner.rs

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crates_io_worker::{BackgroundJob, Runner};
55
use diesel::prelude::*;
66
use diesel_async::pooled_connection::deadpool::Pool;
77
use diesel_async::pooled_connection::AsyncDieselConnectionManager;
8-
use diesel_async::{AsyncConnection, AsyncPgConnection, RunQueryDsl};
8+
use diesel_async::{AsyncPgConnection, RunQueryDsl};
99
use insta::assert_compact_json_snapshot;
1010
use serde::{Deserialize, Serialize};
1111
use serde_json::Value;
@@ -75,11 +75,9 @@ async fn jobs_are_locked_when_fetched() {
7575
};
7676

7777
let pool = pool(test_database.url());
78-
let runner = runner(pool, test_context.clone()).register_job_type::<TestJob>();
78+
let mut conn = pool.get().await.unwrap();
7979

80-
let mut conn = AsyncPgConnection::establish(test_database.url())
81-
.await
82-
.unwrap();
80+
let runner = runner(pool, test_context.clone()).register_job_type::<TestJob>();
8381

8482
let job_id = TestJob.async_enqueue(&mut conn).await.unwrap().unwrap();
8583

@@ -123,11 +121,9 @@ async fn jobs_are_deleted_when_successfully_run() {
123121
let test_database = TestDatabase::new();
124122

125123
let pool = pool(test_database.url());
126-
let runner = runner(pool, ()).register_job_type::<TestJob>();
124+
let mut conn = pool.get().await.unwrap();
127125

128-
let mut conn = AsyncPgConnection::establish(test_database.url())
129-
.await
130-
.unwrap();
126+
let runner = runner(pool, ()).register_job_type::<TestJob>();
131127

132128
assert_eq!(remaining_jobs(&mut conn).await, 0);
133129

@@ -166,11 +162,9 @@ async fn failed_jobs_do_not_release_lock_before_updating_retry_time() {
166162
};
167163

168164
let pool = pool(test_database.url());
169-
let runner = runner(pool, test_context.clone()).register_job_type::<TestJob>();
165+
let mut conn = pool.get().await.unwrap();
170166

171-
let mut conn = AsyncPgConnection::establish(test_database.url())
172-
.await
173-
.unwrap();
167+
let runner = runner(pool, test_context.clone()).register_job_type::<TestJob>();
174168

175169
TestJob.async_enqueue(&mut conn).await.unwrap();
176170

@@ -219,11 +213,9 @@ async fn panicking_in_jobs_updates_retry_counter() {
219213
let test_database = TestDatabase::new();
220214

221215
let pool = pool(test_database.url());
222-
let runner = runner(pool, ()).register_job_type::<TestJob>();
216+
let mut conn = pool.get().await.unwrap();
223217

224-
let mut conn = AsyncPgConnection::establish(test_database.url())
225-
.await
226-
.unwrap();
218+
let runner = runner(pool, ()).register_job_type::<TestJob>();
227219

228220
let job_id = TestJob.async_enqueue(&mut conn).await.unwrap().unwrap();
229221

@@ -285,11 +277,9 @@ async fn jobs_can_be_deduplicated() {
285277
};
286278

287279
let pool = pool(test_database.url());
288-
let runner = runner(pool, test_context.clone()).register_job_type::<TestJob>();
280+
let mut conn = pool.get().await.unwrap();
289281

290-
let mut conn = AsyncPgConnection::establish(test_database.url())
291-
.await
292-
.unwrap();
282+
let runner = runner(pool, test_context.clone()).register_job_type::<TestJob>();
293283

294284
// Enqueue first job
295285
assert_some!(TestJob::new("foo").async_enqueue(&mut conn).await.unwrap());

0 commit comments

Comments
 (0)