Merge pull request #10050 from Turbo87/db-conn

tests/util/test_app: Remove obsolete db_conn() fn

Author: Turbo87

src/tests/account_lock.rs

@@ -11,7 +11,7 @@ async fn lock_account(app: &TestApp, user_id: i32, until: Option<NaiveDateTime>)
     use diesel::prelude::*;
     use diesel_async::RunQueryDsl;
 
-    let mut conn = app.async_db_conn().await;
+    let mut conn = app.db_conn().await;
 
     diesel::update(users::table)
         .set((

src/tests/blocked_routes.rs

@@ -11,7 +11,7 @@ async fn test_non_blocked_download_route() {
         .with_user()
         .await;
 
-    let mut conn = app.async_db_conn().await;
+    let mut conn = app.db_conn().await;
 
     CrateBuilder::new("foo", user.as_model().id)
         .version(VersionBuilder::new("1.0.0"))
@@ -37,7 +37,7 @@ async fn test_blocked_download_route() {
         .with_user()
         .await;
 
-    let mut conn = app.async_db_conn().await;
+    let mut conn = app.db_conn().await;
 
     CrateBuilder::new("foo", user.as_model().id)
         .version(VersionBuilder::new("1.0.0"))

src/tests/dump_db.rs

@@ -16,7 +16,7 @@ static PATH_DATE_RE: LazyLock<Regex> =
 #[tokio::test(flavor = "multi_thread")]
 async fn test_dump_db_job() {
     let (app, _, _, token) = TestApp::full().with_token().await;
-    let mut conn = app.async_db_conn().await;
+    let mut conn = app.db_conn().await;
 
     CrateBuilder::new("test-crate", token.as_model().user_id)
         .expect_build(&mut conn)

src/tests/github_secret_scanning.rs

@@ -45,7 +45,7 @@ async fn github_secret_alert_revokes_token() {
         .with_github(github_mock())
         .with_token()
         .await;
-    let mut conn = app.async_db_conn().await;
+    let mut conn = app.db_conn().await;
 
     // Ensure no emails were sent up to this point
     assert_eq!(app.emails().await.len(), 0);
@@ -106,7 +106,7 @@ async fn github_secret_alert_for_revoked_token() {
         .with_github(github_mock())
         .with_token()
         .await;
-    let mut conn = app.async_db_conn().await;
+    let mut conn = app.db_conn().await;
 
     // Ensure no emails were sent up to this point
     assert_eq!(app.emails().await.len(), 0);
@@ -170,7 +170,7 @@ async fn github_secret_alert_for_unknown_token() {
         .with_github(github_mock())
         .with_token()
         .await;
-    let mut conn = app.async_db_conn().await;
+    let mut conn = app.db_conn().await;
 
     // Ensure no emails were sent up to this point
     assert_eq!(app.emails().await.len(), 0);

src/tests/issues/issue1205.rs

@@ -14,11 +14,10 @@ async fn test_issue_1205() -> anyhow::Result<()> {
         .with_token()
         .await;
 
-    let mut conn = app.db_conn();
-    let mut async_conn = app.async_db_conn().await;
+    let mut conn = app.db_conn().await;
 
     let krate = CrateBuilder::new(CRATE_NAME, user.as_model().id)
-        .expect_build(&mut async_conn)
+        .expect_build(&mut conn)
         .await;
 
     let response = user
@@ -27,7 +26,7 @@ async fn test_issue_1205() -> anyhow::Result<()> {
     assert_eq!(response.status(), StatusCode::OK);
     assert_snapshot!(response.text(), @r#"{"msg":"team github:rustaudio:owners has been added as an owner of crate deepspeech-sys","ok":true}"#);
 
-    let owners = krate.owners(&mut conn)?;
+    let owners = krate.async_owners(&mut conn).await?;
     assert_eq!(owners.len(), 2);
     assert_eq!(owners[0].login(), "foo");
     assert_eq!(owners[1].login(), "github:rustaudio:owners");
@@ -38,7 +37,7 @@ async fn test_issue_1205() -> anyhow::Result<()> {
     assert_eq!(response.status(), StatusCode::OK);
     assert_snapshot!(response.text(), @r#"{"msg":"team github:rustaudio:cratesio-push has been added as an owner of crate deepspeech-sys","ok":true}"#);
 
-    let owners = krate.owners(&mut conn)?;
+    let owners = krate.async_owners(&mut conn).await?;
     assert_eq!(owners.len(), 2);
     assert_eq!(owners[0].login(), "foo");
     assert_eq!(owners[1].login(), "github:rustaudio:cratesio-push");

src/tests/issues/issue2736.rs

@@ -3,15 +3,15 @@ use crate::tests::builders::CrateBuilder;
 use crate::tests::util::{RequestHelper, TestApp};
 use crates_io_database::schema::{crate_owners, users};
 use diesel::prelude::*;
+use diesel_async::RunQueryDsl;
 use http::StatusCode;
 use insta::assert_snapshot;
 
 /// See <https://github.com/rust-lang/crates.io/issues/2736>.
 #[tokio::test(flavor = "multi_thread")]
 async fn test_issue_2736() -> anyhow::Result<()> {
     let (app, _) = TestApp::full().empty().await;
-    let mut conn = app.db_conn();
-    let mut async_conn = app.async_db_conn().await;
+    let mut conn = app.db_conn().await;
 
     // - A user had a GitHub account named, let's say, `foo`
     let foo1 = app.db_new_user("foo").await;
@@ -20,7 +20,7 @@ async fn test_issue_2736() -> anyhow::Result<()> {
     let someone_else = app.db_new_user("someone_else").await;
 
     let krate = CrateBuilder::new("crate1", someone_else.as_model().id)
-        .expect_build(&mut async_conn)
+        .expect_build(&mut conn)
         .await;
 
     diesel::insert_into(crate_owners::table)
@@ -31,7 +31,8 @@ async fn test_issue_2736() -> anyhow::Result<()> {
             owner_kind: OwnerKind::User,
             email_notifications: true,
         })
-        .execute(&mut conn)?;
+        .execute(&mut conn)
+        .await?;
 
     // - `foo` deleted their GitHub account (but crates.io has no real knowledge of this)
     // - `foo` recreated their GitHub account with the same username (because it was still available), but in this situation GitHub assigns them a new ID
@@ -41,13 +42,14 @@ async fn test_issue_2736() -> anyhow::Result<()> {
     let github_ids = users::table
         .filter(users::gh_login.eq("foo"))
         .select(users::gh_id)
-        .load::<i32>(&mut conn)?;
+        .load::<i32>(&mut conn)
+        .await?;
 
     assert_eq!(github_ids.len(), 2);
     assert_ne!(github_ids[0], github_ids[1]);
 
     // - The new `foo` account is NOT an owner of the crate
-    let owners = krate.owners(&mut conn)?;
+    let owners = krate.async_owners(&mut conn).await?;
     assert_eq!(owners.len(), 2);
     assert_none!(owners.iter().find(|o| o.id() == foo2.as_model().id));
 
@@ -56,7 +58,7 @@ async fn test_issue_2736() -> anyhow::Result<()> {
     assert_eq!(response.status(), StatusCode::OK);
     assert_snapshot!(response.text(), @r#"{"msg":"owners successfully removed","ok":true}"#);
 
-    let owners = krate.owners(&mut conn)?;
+    let owners = krate.async_owners(&mut conn).await?;
     assert_eq!(owners.len(), 1);
     assert_eq!(owners[0].id(), someone_else.as_model().id);
 

src/tests/krate/following.rs

@@ -34,7 +34,7 @@ async fn test_unauthenticated_requests() {
     const CRATE_NAME: &str = "foo";
 
     let (app, anon, user) = TestApp::init().with_user().await;
-    let mut conn = app.async_db_conn().await;
+    let mut conn = app.db_conn().await;
 
     CrateBuilder::new(CRATE_NAME, user.as_model().id)
         .expect_build(&mut conn)
@@ -64,7 +64,7 @@ async fn test_following() {
     const CRATE_NAME: &str = "foo_following";
 
     let (app, _, user) = TestApp::init().with_user().await;
-    let mut conn = app.async_db_conn().await;
+    let mut conn = app.db_conn().await;
 
     CrateBuilder::new(CRATE_NAME, user.as_model().id)
         .expect_build(&mut conn)
@@ -122,7 +122,7 @@ async fn test_api_token_auth() {
     const CRATE_NOT_TO_FOLLOW: &str = "another_crate";
 
     let (app, _, user, token) = TestApp::init().with_token().await;
-    let mut conn = app.async_db_conn().await;
+    let mut conn = app.db_conn().await;
     let api_token = token.as_model();
 
     CrateBuilder::new(CRATE_TO_FOLLOW, api_token.user_id)

src/tests/krate/publish/audit_action.rs

@@ -8,7 +8,7 @@ async fn publish_records_an_audit_action() {
 
     let (app, anon, _, token) = TestApp::full().with_token().await;
 
-    let mut conn = app.async_db_conn().await;
+    let mut conn = app.db_conn().await;
     assert!(VersionOwnerAction::all(&mut conn).await.unwrap().is_empty());
 
     // Upload a new crate, putting it in the git index

src/tests/krate/publish/auth.rs

@@ -10,7 +10,7 @@ use insta::assert_snapshot;
 #[tokio::test(flavor = "multi_thread")]
 async fn new_wrong_token() {
     let (app, anon, _, token) = TestApp::full().with_token().await;
-    let mut conn = app.async_db_conn().await;
+    let mut conn = app.db_conn().await;
 
     // Try to publish without a token
     let crate_to_publish = PublishBuilder::new("foo", "1.0.0");
@@ -36,7 +36,7 @@ async fn new_wrong_token() {
 #[tokio::test(flavor = "multi_thread")]
 async fn new_krate_wrong_user() {
     let (app, _, user) = TestApp::full().with_user().await;
-    let mut conn = app.async_db_conn().await;
+    let mut conn = app.db_conn().await;
 
     // Create the foo_wrong crate with one user
     CrateBuilder::new("foo_wrong", user.as_model().id)

src/tests/krate/publish/basics.rs

@@ -10,7 +10,7 @@ use insta::{assert_json_snapshot, assert_snapshot};
 #[tokio::test(flavor = "multi_thread")]
 async fn new_krate() {
     let (app, _, user) = TestApp::full().with_user().await;
-    let mut conn = app.async_db_conn().await;
+    let mut conn = app.db_conn().await;
 
     let crate_to_publish = PublishBuilder::new("foo_new", "1.0.0");
     let response = user.publish_crate(crate_to_publish).await;
@@ -146,7 +146,7 @@ async fn new_krate_twice_alt() {
 #[tokio::test(flavor = "multi_thread")]
 async fn new_krate_duplicate_version() {
     let (app, _, user, token) = TestApp::full().with_token().await;
-    let mut conn = app.async_db_conn().await;
+    let mut conn = app.db_conn().await;
 
     // Insert a crate directly into the database and then we'll try to publish the same version
     CrateBuilder::new("foo_dupe", user.as_model().id)