clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 14:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

test condense

Browse Source
This commit is contained in:
Roy Han
2026-03-02 18:38:01 -08:00
parent c690e66706
commit 4c92bd483e
2 changed files with 112 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

196
codex-rs/core/src/feedback_diagnostics.rs
View File

@@ -177,117 +177,39 @@ mod tests {
use super::sanitize_url_for_display;
#[test]
fn collect_from_pairs_returns_empty_when_no_diagnostics_are_present() {
let diagnostics = FeedbackDiagnostics::collect_from_pairs(Vec::<(String, String)>::new());
assert_eq!(diagnostics, FeedbackDiagnostics::default());
assert_eq!(diagnostics.attachment_text(), None);
}
#[test]
fn collect_from_pairs_reports_proxy_env_vars_in_fixed_order() {
let diagnostics = FeedbackDiagnostics::collect_from_pairs([
("HTTPS_PROXY", "https://secure-proxy.example.com:443"),
("HTTP_PROXY", "proxy.example.com:8080"),
("ALL_PROXY", "socks5h://all-proxy.example.com:1080"),
]);
assert_eq!(
diagnostics,
FeedbackDiagnostics {
diagnostics: vec![FeedbackDiagnostic {
headline: "Proxy environment variables are set and may affect connectivity."
.to_string(),
details: vec![
"HTTP_PROXY = http://proxy.example.com:8080".to_string(),
"HTTPS_PROXY = https://secure-proxy.example.com".to_string(),
"ALL_PROXY = socks5h://all-proxy.example.com:1080".to_string(),
],
}],
}
);
}
#[test]
fn collect_from_pairs_reports_invalid_proxy_values_without_echoing_them() {
let diagnostics =
FeedbackDiagnostics::collect_from_pairs([("HTTP_PROXY", "not a valid\nproxy")]);
assert_eq!(
diagnostics,
FeedbackDiagnostics {
diagnostics: vec![FeedbackDiagnostic {
headline: "Proxy environment variables are set and may affect connectivity."
.to_string(),
details: vec!["HTTP_PROXY = invalid value".to_string()],
}],
}
);
}
#[test]
fn collect_from_pairs_reports_non_default_openai_base_url() {
let diagnostics = FeedbackDiagnostics::collect_from_pairs([(
"OPENAI_BASE_URL",
"https://example.com/v1",
)]);
assert_eq!(
diagnostics,
FeedbackDiagnostics {
diagnostics: vec![FeedbackDiagnostic {
headline: "OPENAI_BASE_URL is set and may affect connectivity.".to_string(),
details: vec!["OPENAI_BASE_URL = https://example.com/v1".to_string()],
}],
}
);
}
#[test]
fn collect_from_pairs_ignores_default_openai_base_url() {
let diagnostics = FeedbackDiagnostics::collect_from_pairs([(
"OPENAI_BASE_URL",
"https://api.openai.com/v1/",
)]);
assert_eq!(diagnostics, FeedbackDiagnostics::default());
}
#[test]
fn collect_from_pairs_reports_invalid_openai_base_url_without_echoing_it() {
let diagnostics =
FeedbackDiagnostics::collect_from_pairs([("OPENAI_BASE_URL", "not a valid\nurl")]);
assert_eq!(
diagnostics,
FeedbackDiagnostics {
diagnostics: vec![FeedbackDiagnostic {
headline: "OPENAI_BASE_URL is set and may affect connectivity.".to_string(),
details: vec!["OPENAI_BASE_URL = invalid value".to_string()],
}],
}
);
}
#[test]
fn sanitize_url_for_display_strips_credentials_query_and_fragment() {
let sanitized = sanitize_url_for_display(
"https://user:password@example.com:8443/v1?token=secret#fragment",
);
assert_eq!(sanitized, Some("https://example.com:8443/v1".to_string()));
}
#[test]
fn write_temp_attachment_persists_sanitized_text() {
fn collect_from_pairs_reports_sanitized_diagnostics_and_attachment() {
let diagnostics = FeedbackDiagnostics::collect_from_pairs([
(
"HTTP_PROXY",
"https://user:password@proxy.example.com:8443?secret=1",
"HTTPS_PROXY",
"https://user:password@secure-proxy.example.com:443?secret=1",
),
("http_proxy", "proxy.example.com:8080"),
("all_proxy", "socks5h://all-proxy.example.com:1080"),
("OPENAI_BASE_URL", "https://example.com/v1?token=secret"),
]);
assert_eq!(
diagnostics,
FeedbackDiagnostics {
diagnostics: vec![
FeedbackDiagnostic {
headline:
"Proxy environment variables are set and may affect connectivity."
.to_string(),
details: vec![
"http_proxy = http://proxy.example.com:8080".to_string(),
"HTTPS_PROXY = https://secure-proxy.example.com".to_string(),
"all_proxy = socks5h://all-proxy.example.com:1080".to_string(),
],
},
FeedbackDiagnostic {
headline: "OPENAI_BASE_URL is set and may affect connectivity.".to_string(),
details: vec!["OPENAI_BASE_URL = https://example.com/v1".to_string()],
},
],
}
);
let attachment = diagnostics
.write_temp_attachment()
.expect("attachment should be written")
@@ -301,8 +223,70 @@ mod tests {
);
assert_eq!(
contents,
"Connectivity diagnostics\n\n- Proxy environment variables are set and may affect connectivity.\n - HTTP_PROXY = https://proxy.example.com:8443\n- OPENAI_BASE_URL is set and may affect connectivity.\n - OPENAI_BASE_URL = https://example.com/v1"
"Connectivity diagnostics\n\n- Proxy environment variables are set and may affect connectivity.\n - http_proxy = http://proxy.example.com:8080\n - HTTPS_PROXY = https://secure-proxy.example.com\n - all_proxy = socks5h://all-proxy.example.com:1080\n- OPENAI_BASE_URL is set and may affect connectivity.\n - OPENAI_BASE_URL = https://example.com/v1"
.to_string()
);
}
#[test]
fn collect_from_pairs_ignores_absent_and_default_values() {
for diagnostics in [
FeedbackDiagnostics::collect_from_pairs(Vec::<(String, String)>::new()),
FeedbackDiagnostics::collect_from_pairs([(
"OPENAI_BASE_URL",
"https://api.openai.com/v1/",
)]),
] {
assert_eq!(diagnostics, FeedbackDiagnostics::default());
assert_eq!(diagnostics.attachment_text(), None);
assert!(
diagnostics
.write_temp_attachment()
.expect("empty diagnostics should not write attachment")
.is_none()
);
}
}
#[test]
fn collect_from_pairs_reports_invalid_values_without_echoing_them() {
let invalid_proxy = "not a valid\nproxy";
let invalid_base_url = "not a valid\nurl";
let diagnostics = FeedbackDiagnostics::collect_from_pairs([
("HTTP_PROXY", invalid_proxy),
("OPENAI_BASE_URL", invalid_base_url),
]);
assert_eq!(
diagnostics,
FeedbackDiagnostics {
diagnostics: vec![
FeedbackDiagnostic {
headline:
"Proxy environment variables are set and may affect connectivity."
.to_string(),
details: vec!["HTTP_PROXY = invalid value".to_string()],
},
FeedbackDiagnostic {
headline: "OPENAI_BASE_URL is set and may affect connectivity.".to_string(),
details: vec!["OPENAI_BASE_URL = invalid value".to_string()],
},
],
}
);
let attachment_text = diagnostics
.attachment_text()
.expect("invalid diagnostics should still render attachment text");
assert!(!attachment_text.contains(invalid_proxy));
assert!(!attachment_text.contains(invalid_base_url));
}
#[test]
fn sanitize_url_for_display_strips_credentials_query_and_fragment() {
let sanitized = sanitize_url_for_display(
"https://user:password@example.com:8443/v1?token=secret#fragment",
);
assert_eq!(sanitized, Some("https://example.com:8443/v1".to_string()));
}
}

69
codex-rs/tui/src/bottom_pane/feedback_view.rs
View File

@@ -647,7 +647,6 @@ mod tests {
use crate::app_event_sender::AppEventSender;
use pretty_assertions::assert_eq;
use std::ffi::OsStr;
use std::fs;
fn render(view: &FeedbackNoteView, width: u16) -> String {
let height = view.desired_height(width);
@@ -753,64 +752,40 @@ mod tests {
}
#[test]
fn prepare_feedback_attachments_skips_diagnostics_without_logs() {
let (tx_raw, _rx) = tokio::sync::mpsc::unbounded_channel::<AppEvent>();
let tx = AppEventSender::new(tx_raw);
let snapshot = codex_feedback::CodexFeedback::new().snapshot(None);
fn prepare_feedback_attachments_only_includes_diagnostics_when_logs_are_enabled() {
let diagnostics = FeedbackDiagnostics::collect_from_pairs([(
"OPENAI_BASE_URL",
"https://example.com/v1",
)]);
let view = FeedbackNoteView::new(
FeedbackCategory::Other,
snapshot,
None,
diagnostics,
tx,
false,
FeedbackAudience::External,
);
let make_view = |include_logs| {
let (tx_raw, _rx) = tokio::sync::mpsc::unbounded_channel::<AppEvent>();
let tx = AppEventSender::new(tx_raw);
let snapshot = codex_feedback::CodexFeedback::new().snapshot(None);
FeedbackNoteView::new(
FeedbackCategory::Other,
snapshot,
None,
diagnostics.clone(),
tx,
include_logs,
FeedbackAudience::External,
)
};
let attachments = view.prepare_feedback_attachments();
assert_eq!(attachments.attachment_paths, Vec::<PathBuf>::new());
assert!(attachments._diagnostics_attachment.is_none());
}
let without_logs = make_view(false).prepare_feedback_attachments();
assert_eq!(without_logs.attachment_paths, Vec::<PathBuf>::new());
assert!(without_logs._diagnostics_attachment.is_none());
#[test]
fn prepare_feedback_attachments_includes_diagnostics_with_logs() {
let (tx_raw, _rx) = tokio::sync::mpsc::unbounded_channel::<AppEvent>();
let tx = AppEventSender::new(tx_raw);
let snapshot = codex_feedback::CodexFeedback::new().snapshot(None);
let diagnostics = FeedbackDiagnostics::collect_from_pairs([(
"OPENAI_BASE_URL",
"https://example.com/v1",
)]);
let view = FeedbackNoteView::new(
FeedbackCategory::Other,
snapshot,
None,
diagnostics,
tx,
true,
FeedbackAudience::External,
);
let attachments = view.prepare_feedback_attachments();
assert_eq!(attachments.attachment_paths.len(), 1);
let with_logs = make_view(true).prepare_feedback_attachments();
assert_eq!(with_logs.attachment_paths.len(), 1);
assert_eq!(
attachments.attachment_paths[0].file_name(),
with_logs.attachment_paths[0].file_name(),
Some(OsStr::new(FEEDBACK_DIAGNOSTICS_ATTACHMENT_FILENAME))
);
assert!(
attachments._diagnostics_attachment.is_some(),
with_logs._diagnostics_attachment.is_some(),
"diagnostics attachment should stay alive until upload completes"
);
let contents = fs::read_to_string(&attachments.attachment_paths[0])
.expect("diagnostics attachment should be readable");
assert_eq!(
contents,
"Connectivity diagnostics\n\n- OPENAI_BASE_URL is set and may affect connectivity.\n - OPENAI_BASE_URL = https://example.com/v1"
);
}
#[test]