GeezerVison

diff --git a/crates/pipeline-manager/src/api/endpoints/pipeline_interaction/support_bundle.rs b/crates/pipeline-manager/src/api/endpoints/pipeline_interaction/support_bundle.rs
index 18e4af5..cf5c927 100644
--- a/crates/pipeline-manager/src/api/endpoints/pipeline_interaction/support_bundle.rs
+++ b/crates/pipeline-manager/src/api/endpoints/pipeline_interaction/support_bundle.rs
@@ -649,6 +649,71 @@ mod tests {
         assert!(dirs.contains(format!("{base}-1").as_str()));
     }
 
+    /// `limit` counts the new collection, and a failed collection ends the
+    /// stream with an error after the first chunk.
+    #[tokio::test(start_paused = true)]
+    async fn bundle_stream_limit_and_failed_collection() {
+        use futures_util::StreamExt;
+
+        let params = SupportBundleParameters {
+            limit: Some(1),
+            ..Default::default()
+        };
+        let collection = async { Ok(SupportBundleData::test_data()) };
+        let chunks: Vec<_> = support_bundle_stream(
+            fake_pipeline("p"),
+            vec![SupportBundleData::test_data(), SupportBundleData::test_data()],
+            Some(collection),
+            params,
+            Duration::from_secs(10),
+        )
+        .collect()
+        .await;
+        let bundle: Vec<u8> = chunks
+            .into_iter()
+            .flat_map(|c| c.unwrap().to_vec())
+            .collect();
+        let mut archive = read_zip(&bundle);
+        let mut metadata = String::new();
+        archive
+            .by_name("metadata.json")
+            .unwrap()
+            .read_to_string(&mut metadata)
+            .unwrap();
+        let metadata: serde_json::Value = serde_json::from_str(&metadata).unwrap();
+        assert_eq!(metadata["collections"].as_array().unwrap().len(), 1);
+
+        // No collection: no log entry.
+        let chunks: Vec<_> = support_bundle_stream(
+            fake_pipeline("p"),
+            vec![SupportBundleData::test_data()],
+            None::<std::future::Ready<Result<SupportBundleData, ManagerError>>>,
+            SupportBundleParameters::default(),
+            Duration::from_secs(10),
+        )
+        .collect()
+        .await;
+        let bundle: Vec<u8> = chunks
+            .into_iter()
+            .flat_map(|c| c.unwrap().to_vec())
+            .collect();
+        assert!(read_zip(&bundle).by_name(COLLECTION_LOG).is_err());
+
+        // Failed collection.
+        let failing = async { Err(bundle_error("boom", "x")) };
+        let results: Vec<_> = support_bundle_stream(
+            fake_pipeline("p"),
+            vec![],
+            Some(failing),
+            SupportBundleParameters::default(),
+            Duration::from_secs(10),
+        )
+        .collect()
+        .await;
+        assert!(results[0].is_ok());
+        assert!(results.last().unwrap().is_err());
+    }
+
     /// The bundle sends bytes while a slow collection runs, not only at its
     /// end, and the result is still one valid ZIP file.
     #[tokio::test(start_paused = true)]