Skip to content

Commit f04551d

Browse files
committed
worker/tests: Move pool() call out of runner() fn
1 parent 7650fe3 commit f04551d

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

crates/crates_io_worker/tests/runner.rs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ async fn jobs_are_locked_when_fetched() {
7474
assertions_finished_barrier: Arc::new(Barrier::new(2)),
7575
};
7676

77-
let runner = runner(test_database.url(), test_context.clone()).register_job_type::<TestJob>();
77+
let pool = pool(test_database.url());
78+
let runner = runner(pool, test_context.clone()).register_job_type::<TestJob>();
7879

7980
let mut conn = AsyncPgConnection::establish(test_database.url())
8081
.await
@@ -121,7 +122,8 @@ async fn jobs_are_deleted_when_successfully_run() {
121122

122123
let test_database = TestDatabase::new();
123124

124-
let runner = runner(test_database.url(), ()).register_job_type::<TestJob>();
125+
let pool = pool(test_database.url());
126+
let runner = runner(pool, ()).register_job_type::<TestJob>();
125127

126128
let mut conn = AsyncPgConnection::establish(test_database.url())
127129
.await
@@ -163,7 +165,8 @@ async fn failed_jobs_do_not_release_lock_before_updating_retry_time() {
163165
job_started_barrier: Arc::new(Barrier::new(2)),
164166
};
165167

166-
let runner = runner(test_database.url(), test_context.clone()).register_job_type::<TestJob>();
168+
let pool = pool(test_database.url());
169+
let runner = runner(pool, test_context.clone()).register_job_type::<TestJob>();
167170

168171
let mut conn = AsyncPgConnection::establish(test_database.url())
169172
.await
@@ -215,7 +218,8 @@ async fn panicking_in_jobs_updates_retry_counter() {
215218

216219
let test_database = TestDatabase::new();
217220

218-
let runner = runner(test_database.url(), ()).register_job_type::<TestJob>();
221+
let pool = pool(test_database.url());
222+
let runner = runner(pool, ()).register_job_type::<TestJob>();
219223

220224
let mut conn = AsyncPgConnection::establish(test_database.url())
221225
.await
@@ -280,7 +284,8 @@ async fn jobs_can_be_deduplicated() {
280284
assertions_finished_barrier: Arc::new(Barrier::new(2)),
281285
};
282286

283-
let runner = runner(test_database.url(), test_context.clone()).register_job_type::<TestJob>();
287+
let pool = pool(test_database.url());
288+
let runner = runner(pool, test_context.clone()).register_job_type::<TestJob>();
284289

285290
let mut conn = AsyncPgConnection::establish(test_database.url())
286291
.await
@@ -323,11 +328,9 @@ fn pool(database_url: &str) -> Pool<AsyncPgConnection> {
323328
}
324329

325330
fn runner<Context: Clone + Send + Sync + 'static>(
326-
database_url: &str,
331+
deadpool: Pool<AsyncPgConnection>,
327332
context: Context,
328333
) -> Runner<Context> {
329-
let deadpool = pool(database_url);
330-
331334
Runner::new(deadpool, context)
332335
.configure_default_queue(|queue| queue.num_workers(2))
333336
.shutdown_when_queue_empty()

0 commit comments

Comments
 (0)