From a299815e5141432b835b18de1ea2b11b0ec2386e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E7=94=B5=E8=8A=BD=E8=A1=A3?= Date: Fri, 8 May 2026 20:05:24 -0400 Subject: [PATCH] Stabilize live site smoke output --- crates/ely_app/src/services/servo_sidecar.rs | 2 +- crates/ely_servo_host/tests/software_host.rs | 39 +++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/crates/ely_app/src/services/servo_sidecar.rs b/crates/ely_app/src/services/servo_sidecar.rs index f11ccf1..ccecced 100644 --- a/crates/ely_app/src/services/servo_sidecar.rs +++ b/crates/ely_app/src/services/servo_sidecar.rs @@ -10,7 +10,7 @@ use ely_domain::UrlText; use serde::Deserialize; use thiserror::Error; -const SIDECAR_BINARY_TIMEOUT: Duration = Duration::from_secs(35); +const SIDECAR_BINARY_TIMEOUT: Duration = Duration::from_secs(45); const SIDECAR_CARGO_TIMEOUT: Duration = Duration::from_secs(180); const SIDECAR_POLL_INTERVAL: Duration = Duration::from_millis(20); const SIDECAR_RETRY_INTERVAL: Duration = Duration::from_millis(250); diff --git a/crates/ely_servo_host/tests/software_host.rs b/crates/ely_servo_host/tests/software_host.rs index 8210907..7e3b661 100644 --- a/crates/ely_servo_host/tests/software_host.rs +++ b/crates/ely_servo_host/tests/software_host.rs @@ -1,6 +1,12 @@ #![cfg(feature = "servo-engine")] -use std::{error::Error, thread, time::Duration}; +use std::{ + env, + error::Error, + process::{Command, Stdio}, + thread, + time::Duration, +}; use ely_domain::{ProfileId, TabId, UrlText}; use ely_servo_host::{ @@ -18,6 +24,7 @@ const PRD_SITE_COMPATIBILITY_CASES: &[PrdSiteCompatibilityCase] = &[ PrdSiteCompatibilityCase { url: "https://example.com", title_fragment: "Example Domain" }, PrdSiteCompatibilityCase { url: "https://servo.org/", title_fragment: "Servo" }, ]; +const SOFTWARE_HOST_CHILD_ENV: &str = "ELY_SERVO_SOFTWARE_HOST_CHILD"; const CLICK_PROBE_URL: &str = "data:text/html,%3C!doctype%20html%3E%3Ctitle%3EClick%20Probe%3C%2Ftitle%3E%3Cstyle%3Ebody%7Bmargin%3A0%3Bbackground%3A%23f7f7f7%3B%7Dbutton%7Bposition%3Aabsolute%3Bleft%3A80px%3Btop%3A80px%3Bwidth%3A220px%3Bheight%3A90px%3Bfont%3A28px%20sans-serif%3Bbackground%3A%23ffffff%3Bcolor%3A%23111111%3B%7D%3C%2Fstyle%3E%3Cbutton%20onclick%3D%22document.body.style.background%3D%27%230039ff%27%3Bdocument.title%3D%27Clicked%27%3Bthis.textContent%3D%27Clicked%27%3B%22%3ETap%3C%2Fbutton%3E"; const DRAG_PROBE_URL: &str = "data:text/html,%3C%21doctype%20html%3E%3Ctitle%3EDrag%20Probe%3C%2Ftitle%3E%3Cstyle%3Ebody%7Bmargin%3A0%3Bbackground%3A%23f7f7f7%3B%7Dbutton%7Bposition%3Aabsolute%3Bleft%3A80px%3Btop%3A80px%3Bwidth%3A220px%3Bheight%3A90px%3Bfont%3A28px%20sans-serif%3Bbackground%3A%23ffffff%3Bcolor%3A%23111111%3B%7D%3C%2Fstyle%3E%3Cbutton%20id%3Dbox%3EDrag%3C%2Fbutton%3E%3Cscript%3Elet%20dragging%3Dfalse%3Bconst%20box%3Ddocument.getElementById%28%27box%27%29%3BaddEventListener%28%27mousedown%27%2Cevent%3D%3E%7Bif%28event.target%3D%3D%3Dbox%29%7Bdragging%3Dtrue%3B%7D%7D%29%3BaddEventListener%28%27mousemove%27%2Cevent%3D%3E%7Bif%28dragging%26%26event.clientX%3E280%29%7Bdocument.body.style.background%3D%27%230039ff%27%3Bdocument.title%3D%27Dragged%27%3Bbox.textContent%3D%27Dragged%27%3B%7D%7D%29%3BaddEventListener%28%27mouseup%27%2C%28%29%3D%3E%7Bdragging%3Dfalse%3B%7D%29%3B%3C%2Fscript%3E"; const TOUCH_PROBE_URL: &str = "data:text/html,%3C%21doctype%20html%3E%3Ctitle%3ETouch%20Probe%3C%2Ftitle%3E%3Cstyle%3Ebody%7Bmargin%3A0%3Bbackground%3A%23f7f7f7%3B%7Dbutton%7Bposition%3Aabsolute%3Bleft%3A80px%3Btop%3A80px%3Bwidth%3A220px%3Bheight%3A90px%3Bfont%3A28px%20sans-serif%3Bbackground%3A%23ffffff%3Bcolor%3A%23111111%3Btouch-action%3Amanipulation%3B%7D%3C%2Fstyle%3E%3Cbutton%20ontouchstart%3D%22document.body.dataset.touch%3D%27start%27%3B%22%20onclick%3D%22document.body.style.background%3D%27%230039ff%27%3Bdocument.title%3D%27Touched%27%3Bthis.textContent%3D%27Touched%27%3B%22%3ETap%3C%2Fbutton%3E"; @@ -31,6 +38,36 @@ struct PrdSiteCompatibilityCase { #[test] fn manages_real_servo_webview_lifecycle() -> Result<(), Box> { + if env::var_os(SOFTWARE_HOST_CHILD_ENV).is_none() { + return run_isolated_software_host_lifecycle(); + } + + exercise_real_servo_webview_lifecycle() +} + +fn run_isolated_software_host_lifecycle() -> Result<(), Box> { + let output = Command::new(env::current_exe()?) + .arg("--exact") + .arg("manages_real_servo_webview_lifecycle") + .env(SOFTWARE_HOST_CHILD_ENV, "1") + .stdout(Stdio::piped()) + .stderr(Stdio::piped()) + .output()?; + + if output.status.success() { + return Ok(()); + } + + Err(format!( + "isolated software host lifecycle failed\nstatus: {}\nstdout: {}\nstderr: {}", + output.status, + String::from_utf8_lossy(&output.stdout), + String::from_utf8_lossy(&output.stderr) + ) + .into()) +} + +fn exercise_real_servo_webview_lifecycle() -> Result<(), Box> { let mut host = SoftwareServoHost::new(ServoSurfaceSize::new(INITIAL_WIDTH, INITIAL_HEIGHT))?; let tab_id = TabId::new(); let profile_id = ProfileId::new();