From 4993cbbee77dd8e2d8453c3a6c301189714bbf28 Mon Sep 17 00:00:00 2001 From: daisuke8000 Date: Sun, 5 Jul 2026 18:09:29 +0900 Subject: [PATCH] Deduplicate sample_ev test helper in forward.rs (DSK-133) Extract one module-level sample_ev() shared by four forward tests. Co-authored-by: Cursor --- crates/rustern-core/src/runtime/forward.rs | 113 +++++---------------- 1 file changed, 23 insertions(+), 90 deletions(-) diff --git a/crates/rustern-core/src/runtime/forward.rs b/crates/rustern-core/src/runtime/forward.rs index 88253a8..a248aa3 100644 --- a/crates/rustern-core/src/runtime/forward.rs +++ b/crates/rustern-core/src/runtime/forward.rs @@ -365,33 +365,34 @@ mod tests { use crate::source::{ContextName, Labels, LogEvent, SourceKind, SourceMeta}; + fn sample_ev() -> LogEvent { + LogEvent { + source: Arc::new(SourceMeta { + context: ContextName("c".into()), + namespace: "n".into(), + pod: "p".into(), + container: "x".into(), + kind: SourceKind::PodLog, + node: None, + labels: Arc::new(Labels::default()), + uid: "u".into(), + palette_index: None, + container_palette_index: None, + }), + timestamp: chrono::Utc::now(), + message: std::sync::Arc::from("x"), + structured: None, + level: None, + palette_index: None, + container_palette_index: None, + } + } + #[tokio::test] async fn forwards_all_events_when_buffer_sufficient() { let metrics = LossyMetrics::new(None); let (tx, mut rx) = mpsc::channel::(1024); let token = CancellationToken::new(); - fn sample_ev() -> LogEvent { - LogEvent { - source: Arc::new(SourceMeta { - context: ContextName("c".into()), - namespace: "n".into(), - pod: "p".into(), - container: "x".into(), - kind: SourceKind::PodLog, - node: None, - labels: Arc::new(Labels::default()), - uid: "u".into(), - palette_index: None, - container_palette_index: None, - }), - timestamp: chrono::Utc::now(), - message: std::sync::Arc::from("x"), - structured: None, - level: None, - palette_index: None, - container_palette_index: None, - } - } let v: Vec<_> = (0..50).map(|_| Ok(sample_ev())).collect(); let s = stream::iter(v); let h = tokio::spawn(forward_to_render( @@ -425,28 +426,6 @@ mod tests { let metrics = LossyMetrics::new(None); let (tx, rx) = mpsc::channel::(1); let token = CancellationToken::new(); - fn sample_ev() -> LogEvent { - LogEvent { - source: Arc::new(SourceMeta { - context: ContextName("c".into()), - namespace: "n".into(), - pod: "p".into(), - container: "x".into(), - kind: SourceKind::PodLog, - node: None, - labels: Arc::new(Labels::default()), - uid: "u".into(), - palette_index: None, - container_palette_index: None, - }), - timestamp: chrono::Utc::now(), - message: std::sync::Arc::from("x"), - structured: None, - level: None, - palette_index: None, - container_palette_index: None, - } - } let v: Vec<_> = (0..32).map(|_| Ok(sample_ev())).collect(); let s = stream::iter(v); let h = tokio::spawn(forward_to_render( @@ -476,29 +455,6 @@ mod tests { let (tx, _rx) = mpsc::channel::(1); let token = CancellationToken::new(); - fn sample_ev() -> LogEvent { - LogEvent { - source: Arc::new(SourceMeta { - context: ContextName("c".into()), - namespace: "n".into(), - pod: "p".into(), - container: "x".into(), - kind: SourceKind::PodLog, - node: None, - labels: Arc::new(Labels::default()), - uid: "u".into(), - palette_index: None, - container_palette_index: None, - }), - timestamp: chrono::Utc::now(), - message: std::sync::Arc::from("x"), - structured: None, - level: None, - palette_index: None, - container_palette_index: None, - } - } - let s = stream::iter(vec![Ok(sample_ev()), Ok(sample_ev())]); let h = tokio::spawn(forward_to_render( s, @@ -532,29 +488,6 @@ mod tests { let (tx, mut rx) = mpsc::channel::(8); let token = CancellationToken::new(); - fn sample_ev() -> LogEvent { - LogEvent { - source: Arc::new(SourceMeta { - context: ContextName("c".into()), - namespace: "n".into(), - pod: "p".into(), - container: "x".into(), - kind: SourceKind::PodLog, - node: None, - labels: Arc::new(Labels::default()), - uid: "u".into(), - palette_index: None, - container_palette_index: None, - }), - timestamp: chrono::Utc::now(), - message: std::sync::Arc::from("x"), - structured: None, - level: None, - palette_index: None, - container_palette_index: None, - } - } - let s = stream::iter(vec![ Ok(sample_ev()), Err(LogSourceError::Api("conn reset".into())),