Skip to content

Commit 05582a5

Browse files
committed
kk
1 parent b60f614 commit 05582a5

File tree

5 files changed

+64
-4
lines changed

5 files changed

+64
-4
lines changed

.sqlx/query-4b13fe2c8df2b8b8bf019344313b2bc6442482a604cf90fb6106154f8e69a1c2.json

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.sqlx/query-f8b389df3451e4b5e6539e9260ba6340edf69c7dba22e667aedd510e868b0f00.json

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/build_queue.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -887,12 +887,10 @@ FROM crates AS c
887887
mod tests {
888888
use super::*;
889889
use crate::db::types::BuildStatus;
890-
use crate::test::{FakeBuild, TestEnvironment, V1, V2};
890+
use crate::test::{FakeBuild, KRATE, TestEnvironment, V1, V2};
891891
use chrono::Utc;
892892
use std::time::Duration;
893893

894-
static KRATE: &str = "krate";
895-
896894
#[tokio::test(flavor = "multi_thread")]
897895
async fn test_rebuild_when_old() -> Result<()> {
898896
let env = TestEnvironment::with_config(

src/db/delete.rs

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ mod tests {
209209
use crate::db::ReleaseId;
210210
use crate::registry_api::{CrateOwner, OwnerKind};
211211
use crate::storage::{CompressionAlgorithm, rustdoc_json_path};
212-
use crate::test::{V1, V2, async_wrapper, fake_release_that_failed_before_build};
212+
use crate::test::{KRATE, V1, V2, async_wrapper, fake_release_that_failed_before_build};
213213
use test_case::test_case;
214214

215215
async fn crate_exists(conn: &mut sqlx::PgConnection, name: &str) -> Result<bool> {
@@ -527,4 +527,35 @@ mod tests {
527527
Ok(())
528528
})
529529
}
530+
531+
#[tokio::test(flavor = "multi_thread")]
532+
async fn test_delete_missing_crate_doesnt_error() -> Result<()> {
533+
let env = crate::test::TestEnvironment::new().await?;
534+
535+
let db = env.async_db();
536+
let mut conn = db.async_conn().await;
537+
538+
assert!(!crate_exists(&mut conn, KRATE).await?);
539+
delete_crate(&mut conn, env.async_storage(), env.config(), KRATE).await?;
540+
541+
assert!(!crate_exists(&mut conn, KRATE).await?);
542+
543+
Ok(())
544+
}
545+
546+
#[tokio::test(flavor = "multi_thread")]
547+
async fn test_delete_missing_version_doesnt_error() -> Result<()> {
548+
let env = crate::test::TestEnvironment::new().await?;
549+
550+
let db = env.async_db();
551+
let mut conn = db.async_conn().await;
552+
553+
assert!(!crate_exists(&mut conn, KRATE).await?);
554+
555+
delete_version(&mut conn, env.async_storage(), env.config(), KRATE, &V1).await?;
556+
557+
assert!(!crate_exists(&mut conn, KRATE).await?);
558+
559+
Ok(())
560+
}
530561
}

src/test/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ use tokio::{runtime, task::block_in_place};
4141
use tower::ServiceExt;
4242
use tracing::error;
4343

44+
// testing krate name constants
45+
pub(crate) const KRATE: &str = "krate";
4446
// some versions as constants for tests
4547
pub(crate) const V0_1: Version = Version::new(0, 1, 0);
4648
pub(crate) const V1: Version = Version::new(1, 0, 0);

0 commit comments

Comments
 (0)