再次合并最新master到埋点开发分支

同步主分支最新改动并保留客户端埋点实现

server-rs/crates/preview-deployer-server/src/tests.rs

@@ -461,6 +461,9 @@ async fn deploy_and_uninstall_use_fixed_job_and_apply_owned_artifacts() {
         .to_bytes();
     let list: Value = serde_json::from_slice(&list_body).unwrap();
     assert_eq!(list["deployments"], json!([]));
+    wait_for_persisted_status(&state.config, &id, super::DeploymentStatus::Stopped)
+        .await
+        .expect("persisted deployment reaches stopped");
     let state_file = state.config.state_file.clone();
     let mut recovered_config = test_config(state.config.jenkins_root_url.clone());
     recovered_config.state_file = state_file.clone();
@@ -659,6 +662,24 @@ async fn wait_for_status(
     Err(())
 }
 
+async fn wait_for_persisted_status(
+    config: &Config,
+    id: &str,
+    expected: super::DeploymentStatus,
+) -> Result<(), ()> {
+    for _ in 0..100 {
+        if super::load_deployments(config)
+            .ok()
+            .and_then(|deployments| deployments.get(id).map(|record| record.public.status))
+            .is_some_and(|status| status == expected)
+        {
+            return Ok(());
+        }
+        tokio::time::sleep(Duration::from_millis(5)).await;
+    }
+    Err(())
+}
+
 #[test]
 fn public_web_url_is_derived_from_instance_id_and_configured_domain() {
     assert_eq!(