fix: tighten edge cases across services (#3158)

tools/ci/src/app_proxy.rs

@@ -688,7 +688,7 @@ mod tests {
         ] {
             assert!(
                 manifest.contains(entry),
-                "the rust-builder workspace manifest replaces the repository root one, so it must carry {entry}"
+                "the rust-builder workspace manifest replaces the repository root one, so it must contain {entry}"
             );
         }
         assert!(
@@ -774,7 +774,7 @@ mod tests {
     }
 
     #[test]
-    fn uploaded_assets_carry_the_same_policy_the_app_proxy_serves() {
+    fn uploaded_assets_get_the_same_policy_the_app_proxy_serves() {
         assert_eq!(
             IMMUTABLE_ASSET_CACHE_CONTROL,
             "public, max-age=31536000, immutable"
@@ -978,7 +978,7 @@ mod tests {
         ] {
             assert!(
                 dockerfile.contains(entry),
-                "every architecture must serve the injected canonical tree, so the Dockerfile must carry {entry}"
+                "every architecture must serve the injected canonical tree, so the Dockerfile must contain {entry}"
             );
         }
     }
@@ -1016,7 +1016,7 @@ mod tests {
             "APP_ASSETS_REF                        = APP_ASSETS_REF",
             "APP_ASSETS_PLATFORM                   = APP_ASSETS_PLATFORM",
         ] {
-            assert!(bake.contains(entry), "docker-bake.hcl must carry {entry}");
+            assert!(bake.contains(entry), "docker-bake.hcl must contain {entry}");
         }
     }
 

tools/ci/src/ci_workflow.rs

@@ -335,7 +335,7 @@ mod tests {
     }
 
     #[test]
-    fn image_dockerfiles_carry_the_release_label_block() {
+    fn image_dockerfiles_include_the_release_label_block() {
         const REQUIRED: [&str; 9] = [
             "LABEL org.opencontainers.image.licenses=\"AGPL-3.0-or-later\"",
             "LABEL org.opencontainers.image.vendor=\"Fluxer\"",

tools/ci/src/desktop.rs

@@ -2884,7 +2884,7 @@ fn assert_fluxer_signed(row: &SignatureRow) -> Result<()> {
     );
     ensure!(
         row.ts_subject.is_some(),
-        "Authenticode signature carries no RFC3161 timestamp"
+        "Authenticode signature has no RFC3161 timestamp"
     );
     let subject = row
         .subject

tools/ci/src/image_set.rs

@@ -1313,7 +1313,7 @@ mod tests {
         ] {
             assert!(
                 workflow.contains(entry),
-                "release-image-set.yaml must carry {entry}"
+                "release-image-set.yaml must contain {entry}"
             );
         }
         assert!(

tools/ci/src/release.rs

@@ -1281,7 +1281,7 @@ mod tests {
     }
 
     #[test]
-    fn a_release_carrying_an_extra_route_is_refused() {
+    fn a_release_with_an_extra_route_is_refused() {
         let mut descriptor = sample_descriptor();
         let extra = DesktopReleaseAsset {
             storage_key: format!("desktop/{SAMPLE_CHANNEL}/linux/x64/latest-linux.yml"),