Hare/yoi
1
1
Fork 0
Code Actions Packages Releases Activity

fix: remove stale pod guidance references

Browse Source
This commit is contained in:
Hare
2026-06-26 00:57:27 +09:00
parent 94c7aa793a
commit da96d06f25
10 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/e2e/src/lib.rs
+18 -18
View File
@@ -357,7 +357,7 @@ impl ExpectedPanelTicketRow {
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct ExpectedDashboardContent {
pub tickets: Vec<ExpectedPanelTicketRow>,
pub pod_names: Vec<String>,
pub worker_names: Vec<String>,
pub companion_status: String,
pub orchestrator_status: String,
}
@@ -366,7 +366,7 @@ impl ExpectedDashboardContent {
pub fn snapshot(&self) -> DashboardContentSnapshot {
DashboardContentSnapshot {
tickets: self.tickets.clone(),
pod_names: self.pod_names.clone(),
worker_names: self.worker_names.clone(),
companion_status: self.companion_status.clone(),
orchestrator_status: self.orchestrator_status.clone(),
}
@@ -379,9 +379,9 @@ impl ExpectedDashboardContent {
.map(ExpectedPanelTicketRow::description)
.collect::<Vec<_>>()
.join(", ");
let pods = self.pod_names.join(", ");
let workers = self.worker_names.join(", ");
format!(
"tickets=[{tickets}] pods=[{pods}] companion={} orchestrator={}",
"tickets=[{tickets}] workers=[{workers}] companion={} orchestrator={}",
self.companion_status, self.orchestrator_status
)
}
@@ -390,7 +390,7 @@ impl ExpectedDashboardContent {
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct DashboardContentSnapshot {
pub tickets: Vec<ExpectedPanelTicketRow>,
pub pod_names: Vec<String>,
pub worker_names: Vec<String>,
pub companion_status: String,
pub orchestrator_status: String,
}
@@ -418,13 +418,13 @@ pub struct DashboardHeader {
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct DashboardCompanionState {
pub pod_name: String,
pub worker_name: String,
pub status: String,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct DashboardOrchestratorState {
pub pod_name: String,
pub worker_name: String,
pub status: String,
pub detail: Option<String>,
}
@@ -434,7 +434,7 @@ pub struct DashboardContentCategories {
pub ticket_rows: usize,
pub ready_ticket_rows: usize,
pub planning_ticket_rows: usize,
pub pod_rows: usize,
pub worker_rows: usize,
pub actionable_rows: usize,
}
@@ -457,14 +457,14 @@ impl DashboardContentReady {
.filter(|ticket| self.snapshot.rows.iter().any(|row| ticket.matches(row)))
.cloned()
.collect(),
pod_names: expected
.pod_names
worker_names: expected
.worker_names
.iter()
.filter(|pod_name| {
.filter(|worker_name| {
self.snapshot
.rows
.iter()
.any(|row| row.key.kind == "pod" && row.key.id == pod_name.as_str())
.any(|row| row.key.kind == "worker" && row.key.id == worker_name.as_str())
})
.cloned()
.collect(),
@@ -491,7 +491,7 @@ pub struct DashboardSourceBreakdown {
pub total_elapsed_ms: u128,
pub sources: Vec<DashboardSourceTiming>,
pub ticket_rows: usize,
pub pod_rows: usize,
pub worker_rows: usize,
pub diagnostics: usize,
}
@@ -870,7 +870,7 @@ impl PanelHarness {
/// Waits for the dashboard-content-ready observer event. Unlike first-frame
/// or row-count readiness, this requires representative user-visible content:
/// ready + planning Ticket rows and a Pod row, then checks the fixture-specific
/// ready + planning Ticket rows and a Worker row, then checks the fixture-specific
/// rows as a small snapshot of the expected dashboard content.
pub fn wait_for_dashboard_content_ready(
&mut self,
@@ -1442,7 +1442,7 @@ impl FixtureWorkspace {
self.ready_overlay_ticket_row(),
self.planning_fixture_ticket_row(),
],
pod_names: vec!["workspace".to_string()],
worker_names: vec!["workspace".to_string()],
companion_status: "spawned".to_string(),
orchestrator_status: "unavailable".to_string(),
}
@@ -1538,7 +1538,7 @@ impl FixtureWorkspace {
config.command_args = vec![
"--workspace".to_string(),
self.workspace.display().to_string(),
"--pod".to_string(),
"--worker".to_string(),
"e2e-rewind".to_string(),
];
config.artifacts_dir = self.artifacts_dir.join("rewind");
@@ -1997,8 +1997,8 @@ fn copy_dir_recursive(source: &Path, destination: &Path) -> Result<()> {
Ok(())
}
fn write_blocking_pod_metadata(data_home: &Path, pod_name: &str) -> Result<()> {
let dir = data_home.join("yoi").join("pods").join(pod_name);
fn write_blocking_pod_metadata(data_home: &Path, worker_name: &str) -> Result<()> {
let dir = data_home.join("yoi").join("pods").join(worker_name);
fs::create_dir_all(&dir)?;
fs::write(dir.join("metadata.json"), b"not valid metadata for e2e\n")?;
Ok(())
tests/e2e/tests/panel.rs
+6 -6
View File
@@ -68,11 +68,11 @@ fn ready_snapshot(rows: Vec<RenderedPanelRow>) -> DashboardContentReady {
header: DashboardHeader {
ticket_configured: true,
companion: Some(DashboardCompanionState {
pod_name: "workspace".to_string(),
worker_name: "workspace".to_string(),
status: "unavailable".to_string(),
}),
orchestrator: Some(DashboardOrchestratorState {
pod_name: "workspace-orchestrator".to_string(),
worker_name: "workspace-orchestrator".to_string(),
status: "unavailable".to_string(),
detail: Some("fixture blocks host Pod launch".to_string()),
}),
@@ -84,7 +84,7 @@ fn ready_snapshot(rows: Vec<RenderedPanelRow>) -> DashboardContentReady {
ticket_rows: 2,
ready_ticket_rows: 1,
planning_ticket_rows: 1,
pod_rows: 1,
worker_rows: 1,
actionable_rows: 2,
},
}
@@ -147,7 +147,7 @@ fn dashboard_snapshot_rejects_missing_row_wrong_state_missing_overlay_and_missin
.with_local_state("planning");
let expected = ExpectedDashboardContent {
tickets: vec![expected_ready.clone(), expected_planning.clone()],
pod_names: vec!["workspace".to_string()],
worker_names: vec!["workspace".to_string()],
companion_status: "unavailable".to_string(),
orchestrator_status: "unavailable".to_string(),
};
@@ -330,8 +330,8 @@ fn panel_dashboard_content_ready_has_startup_budget() -> yoi_e2e::Result<()> {
assert!(
content_ready.categories.ready_ticket_rows > 0
&& content_ready.categories.planning_ticket_rows > 0
&& content_ready.categories.pod_rows > 0,
"dashboard content ready must include ready Ticket, planning Ticket, and Pod categories; got {:?}; artifacts at {}",
&& content_ready.categories.worker_rows > 0,
"dashboard content ready must include ready Ticket, planning Ticket, and Worker categories; got {:?}; artifacts at {}",
content_ready.categories,
panel.artifacts().dir.display()
);