assert that json exists for all targets

Author: syphar

src/db/delete.rs

@@ -406,6 +406,17 @@ mod tests {
                 .collect())
             }
 
+            async fn json_exists(storage: &AsyncStorage, version: &str) -> Result<bool> {
+                storage
+                    .exists(&rustdoc_json_path(
+                        "a",
+                        version,
+                        "x86_64-unknown-linux-gnu",
+                        crate::storage::RustdocJsonFormatVersion::Latest,
+                    ))
+                    .await
+            }
+
             let mut conn = env.async_db().await.async_conn().await;
             let v1 = env
                 .fake_release()
@@ -427,17 +438,7 @@ mod tests {
                     .rustdoc_file_exists("a", "1.0.0", None, "a/index.html", archive_storage)
                     .await?
             );
-            assert!(
-                env.async_storage()
-                    .await
-                    .exists(&rustdoc_json_path(
-                        "a",
-                        "1.0.0",
-                        "x86_64-unknown-linux-gnu",
-                        crate::storage::RustdocJsonFormatVersion::Latest
-                    ))
-                    .await?
-            );
+            assert!(json_exists(&*env.async_storage().await, "1.0.0").await?);
             let crate_id = sqlx::query_scalar!(
                 r#"SELECT crate_id as "crate_id: CrateId" FROM releases WHERE id = $1"#,
                 v1.0
@@ -469,17 +470,7 @@ mod tests {
                     .rustdoc_file_exists("a", "2.0.0", None, "a/index.html", archive_storage)
                     .await?
             );
-            assert!(
-                env.async_storage()
-                    .await
-                    .exists(&rustdoc_json_path(
-                        "a",
-                        "2.0.0",
-                        "x86_64-unknown-linux-gnu",
-                        crate::storage::RustdocJsonFormatVersion::Latest
-                    ))
-                    .await?
-            );
+            assert!(json_exists(&*env.async_storage().await, "2.0.0").await?);
             assert_eq!(
                 owners(&mut conn, crate_id).await?,
                 vec!["Peter Rabbit".to_string()]
@@ -517,17 +508,7 @@ mod tests {
                         .await?
                 );
             }
-            assert!(
-                !env.async_storage()
-                    .await
-                    .exists(&rustdoc_json_path(
-                        "a",
-                        "1.0.0",
-                        "x86_64-unknown-linux-gnu",
-                        crate::storage::RustdocJsonFormatVersion::Latest
-                    ))
-                    .await?
-            );
+            assert!(!json_exists(&*env.async_storage().await, "1.0.0").await?);
 
             assert!(release_exists(&mut conn, v2).await?);
             assert!(
@@ -536,17 +517,7 @@ mod tests {
                     .rustdoc_file_exists("a", "2.0.0", None, "a/index.html", archive_storage)
                     .await?
             );
-            assert!(
-                env.async_storage()
-                    .await
-                    .exists(&rustdoc_json_path(
-                        "a",
-                        "2.0.0",
-                        "x86_64-unknown-linux-gnu",
-                        crate::storage::RustdocJsonFormatVersion::Latest
-                    ))
-                    .await?
-            );
+            assert!(json_exists(&*env.async_storage().await, "2.0.0").await?);
             assert_eq!(
                 owners(&mut conn, crate_id).await?,
                 vec!["Peter Rabbit".to_string()]

src/docbuilder/rustwide_builder.rs

@@ -24,7 +24,6 @@ use crate::{AsyncStorage, Config, Context, InstanceMetrics, RegistryApi, Storage
 use crate::{db::blacklist::is_blacklisted, utils::MetadataPackage};
 use anyhow::{Context as _, Error, anyhow, bail};
 use docsrs_metadata::{BuildTargets, DEFAULT_TARGETS, HOST_TARGET, Metadata};
-use itertools::Itertools;
 use once_cell::sync::Lazy;
 use regex::Regex;
 use rustwide::cmd::{Command, CommandError, SandboxBuilder, SandboxImage};
@@ -1425,6 +1424,14 @@ mod tests {
 
                 // other targets too
                 for target in DEFAULT_TARGETS {
+                    // check if rustdoc json files exist for all targets
+                    assert!(storage.exists(&rustdoc_json_path(
+                        crate_,
+                        version,
+                        target,
+                        RustdocJsonFormatVersion::Latest
+                    ))?);
+
                     if target == &default_target {
                         continue;
                     }

src/test/fakes.rs

@@ -530,7 +530,7 @@ impl<'a> FakeRelease<'a> {
                             &rustdoc_json_path(
                                 &package.name,
                                 &package.version,
-                                &target,
+                                target,
                                 format_version,
                             ),
                             serde_json::to_vec(&serde_json::json!({