From 369f047ebe730b41449cc1d6a3f09965a5c038ce Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Thu, 24 Apr 2025 13:56:24 +0200 Subject: [PATCH 1/2] tests/builders: Replace `AppResult` with `anyhow` There is no need anymore for these functions to return an `AppResult`, we can use generic `anyhow::Result` instead :tada: --- src/tests/builders/krate.rs | 3 +-- src/tests/builders/version.rs | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/tests/builders/krate.rs b/src/tests/builders/krate.rs index 88e6adddf30..7cfbc09f16f 100644 --- a/src/tests/builders/krate.rs +++ b/src/tests/builders/krate.rs @@ -1,6 +1,5 @@ use crate::models::{Category, Crate, Keyword, NewCrate, update_default_version}; use crate::schema::{crate_downloads, crates, version_downloads}; -use crate::util::errors::AppResult; use super::VersionBuilder; use chrono::{DateTime, Utc}; @@ -114,7 +113,7 @@ impl<'a> CrateBuilder<'a> { self } - pub async fn build(mut self, connection: &mut AsyncPgConnection) -> AppResult { + pub async fn build(mut self, connection: &mut AsyncPgConnection) -> anyhow::Result { use diesel::{insert_into, select, update}; let mut krate = self.krate.create(connection, self.owner_id).await?; diff --git a/src/tests/builders/version.rs b/src/tests/builders/version.rs index d8c0ccb1ac5..5ad27f8fd2f 100644 --- a/src/tests/builders/version.rs +++ b/src/tests/builders/version.rs @@ -1,6 +1,5 @@ use crate::models::{Crate, NewVersion, Version}; use crate::schema::dependencies; -use crate::util::errors::AppResult; use std::collections::BTreeMap; use chrono::{DateTime, Utc}; @@ -94,7 +93,7 @@ impl VersionBuilder { crate_id: i32, published_by: i32, connection: &mut AsyncPgConnection, - ) -> AppResult { + ) -> anyhow::Result { use diesel::insert_into; let version = self.num.to_string(); From 1f0a4a57786b70cfc80987ca33e7b37ba7069abc Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Thu, 24 Apr 2025 13:58:45 +0200 Subject: [PATCH 2/2] tests/unhealthy_database: Replace `unwrap()` with `?` --- src/tests/unhealthy_database.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/tests/unhealthy_database.rs b/src/tests/unhealthy_database.rs index 0286e5ac89c..8cf534837df 100644 --- a/src/tests/unhealthy_database.rs +++ b/src/tests/unhealthy_database.rs @@ -60,8 +60,7 @@ async fn download_requests_with_unhealthy_database_succeed() -> anyhow::Result<( CrateBuilder::new("foo", token.as_model().user_id) .version("1.0.0") .build(&mut conn) - .await - .unwrap(); + .await?; app.primary_db_chaosproxy().break_networking()?;