mirror of
https://github.com/openai/codex.git
synced 2026-05-20 03:05:02 +00:00
## Why `argument-comment-lint` was green in CI even though the repo still had many uncommented literal arguments. The main gap was target coverage: the repo wrapper did not force Cargo to inspect test-only call sites, so examples like the `latest_session_lookup_params(true, ...)` tests in `codex-rs/tui_app_server/src/lib.rs` never entered the blocking CI path. This change cleans up the existing backlog, makes the default repo lint path cover all Cargo targets, and starts rolling that stricter CI enforcement out on the platform where it is currently validated. ## What changed - mechanically fixed existing `argument-comment-lint` violations across the `codex-rs` workspace, including tests, examples, and benches - updated `tools/argument-comment-lint/run-prebuilt-linter.sh` and `tools/argument-comment-lint/run.sh` so non-`--fix` runs default to `--all-targets` unless the caller explicitly narrows the target set - fixed both wrappers so forwarded cargo arguments after `--` are preserved with a single separator - documented the new default behavior in `tools/argument-comment-lint/README.md` - updated `rust-ci` so the macOS lint lane keeps the plain wrapper invocation and therefore enforces `--all-targets`, while Linux and Windows temporarily pass `-- --lib --bins` That temporary CI split keeps the stricter all-targets check where it is already cleaned up, while leaving room to finish the remaining Linux- and Windows-specific target-gated cleanup before enabling `--all-targets` on those runners. The Linux and Windows failures on the intermediate revision were caused by the wrapper forwarding bug, not by additional lint findings in those lanes. ## Validation - `bash -n tools/argument-comment-lint/run.sh` - `bash -n tools/argument-comment-lint/run-prebuilt-linter.sh` - shell-level wrapper forwarding check for `-- --lib --bins` - shell-level wrapper forwarding check for `-- --tests` - `just argument-comment-lint` - `cargo test` in `tools/argument-comment-lint` - `cargo test -p codex-terminal-detection` ## Follow-up - Clean up remaining Linux-only target-gated callsites, then switch the Linux lint lane back to the plain wrapper invocation. - Clean up remaining Windows-only target-gated callsites, then switch the Windows lint lane back to the plain wrapper invocation.
357 lines
11 KiB
Rust
357 lines
11 KiB
Rust
use super::*;
|
|
use notify::event::AccessKind;
|
|
use notify::event::AccessMode;
|
|
use notify::event::CreateKind;
|
|
use notify::event::ModifyKind;
|
|
use pretty_assertions::assert_eq;
|
|
use tokio::time::timeout;
|
|
|
|
const TEST_THROTTLE_INTERVAL: Duration = Duration::from_millis(50);
|
|
|
|
fn path(name: &str) -> PathBuf {
|
|
PathBuf::from(name)
|
|
}
|
|
|
|
fn notify_event(kind: EventKind, paths: Vec<PathBuf>) -> Event {
|
|
let mut event = Event::new(kind);
|
|
for path in paths {
|
|
event = event.add_path(path);
|
|
}
|
|
event
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn throttled_receiver_coalesces_within_interval() {
|
|
let (tx, rx) = watch_channel();
|
|
let mut throttled = ThrottledWatchReceiver::new(rx, TEST_THROTTLE_INTERVAL);
|
|
|
|
tx.add_changed_paths(&[path("a")]).await;
|
|
let first = timeout(Duration::from_secs(1), throttled.recv())
|
|
.await
|
|
.expect("first emit timeout");
|
|
assert_eq!(
|
|
first,
|
|
Some(FileWatcherEvent {
|
|
paths: vec![path("a")],
|
|
})
|
|
);
|
|
|
|
tx.add_changed_paths(&[path("b"), path("c")]).await;
|
|
let blocked = timeout(TEST_THROTTLE_INTERVAL / 2, throttled.recv()).await;
|
|
assert_eq!(blocked.is_err(), true);
|
|
|
|
let second = timeout(TEST_THROTTLE_INTERVAL * 2, throttled.recv())
|
|
.await
|
|
.expect("second emit timeout");
|
|
assert_eq!(
|
|
second,
|
|
Some(FileWatcherEvent {
|
|
paths: vec![path("b"), path("c")],
|
|
})
|
|
);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn throttled_receiver_flushes_pending_on_shutdown() {
|
|
let (tx, rx) = watch_channel();
|
|
let mut throttled = ThrottledWatchReceiver::new(rx, TEST_THROTTLE_INTERVAL);
|
|
|
|
tx.add_changed_paths(&[path("a")]).await;
|
|
let first = timeout(Duration::from_secs(1), throttled.recv())
|
|
.await
|
|
.expect("first emit timeout");
|
|
assert_eq!(
|
|
first,
|
|
Some(FileWatcherEvent {
|
|
paths: vec![path("a")],
|
|
})
|
|
);
|
|
|
|
tx.add_changed_paths(&[path("b")]).await;
|
|
drop(tx);
|
|
|
|
let second = timeout(Duration::from_secs(1), throttled.recv())
|
|
.await
|
|
.expect("shutdown flush timeout");
|
|
assert_eq!(
|
|
second,
|
|
Some(FileWatcherEvent {
|
|
paths: vec![path("b")],
|
|
})
|
|
);
|
|
|
|
let closed = timeout(Duration::from_secs(1), throttled.recv())
|
|
.await
|
|
.expect("closed recv timeout");
|
|
assert_eq!(closed, None);
|
|
}
|
|
|
|
#[test]
|
|
fn is_mutating_event_filters_non_mutating_event_kinds() {
|
|
assert_eq!(
|
|
is_mutating_event(¬ify_event(
|
|
EventKind::Create(CreateKind::Any),
|
|
vec![path("/tmp/created")]
|
|
)),
|
|
true
|
|
);
|
|
assert_eq!(
|
|
is_mutating_event(¬ify_event(
|
|
EventKind::Modify(ModifyKind::Any),
|
|
vec![path("/tmp/modified")]
|
|
)),
|
|
true
|
|
);
|
|
assert_eq!(
|
|
is_mutating_event(¬ify_event(
|
|
EventKind::Access(AccessKind::Open(AccessMode::Any)),
|
|
vec![path("/tmp/accessed")]
|
|
)),
|
|
false
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn register_dedupes_by_path_and_scope() {
|
|
let watcher = Arc::new(FileWatcher::noop());
|
|
let (subscriber, _rx) = watcher.add_subscriber();
|
|
let _first = subscriber.register_path(path("/tmp/skills"), /*recursive*/ false);
|
|
let _second = subscriber.register_path(path("/tmp/skills"), /*recursive*/ false);
|
|
let _third = subscriber.register_path(path("/tmp/skills"), /*recursive*/ true);
|
|
let _fourth = subscriber.register_path(path("/tmp/other-skills"), /*recursive*/ true);
|
|
|
|
assert_eq!(
|
|
watcher.watch_counts_for_test(&path("/tmp/skills")),
|
|
Some((2, 1))
|
|
);
|
|
assert_eq!(
|
|
watcher.watch_counts_for_test(&path("/tmp/other-skills")),
|
|
Some((0, 1))
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn watch_registration_drop_unregisters_paths() {
|
|
let watcher = Arc::new(FileWatcher::noop());
|
|
let (subscriber, _rx) = watcher.add_subscriber();
|
|
let registration = subscriber.register_path(path("/tmp/skills"), /*recursive*/ true);
|
|
|
|
drop(registration);
|
|
|
|
assert_eq!(watcher.watch_counts_for_test(&path("/tmp/skills")), None);
|
|
}
|
|
|
|
#[test]
|
|
fn subscriber_drop_unregisters_paths() {
|
|
let watcher = Arc::new(FileWatcher::noop());
|
|
let registration = {
|
|
let (subscriber, _rx) = watcher.add_subscriber();
|
|
subscriber.register_path(path("/tmp/skills"), /*recursive*/ true)
|
|
};
|
|
|
|
assert_eq!(watcher.watch_counts_for_test(&path("/tmp/skills")), None);
|
|
drop(registration);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn receiver_closes_when_subscriber_drops() {
|
|
let watcher = Arc::new(FileWatcher::noop());
|
|
let (subscriber, mut rx) = watcher.add_subscriber();
|
|
|
|
drop(subscriber);
|
|
|
|
let closed = timeout(Duration::from_secs(1), rx.recv())
|
|
.await
|
|
.expect("closed recv timeout");
|
|
assert_eq!(closed, None);
|
|
}
|
|
|
|
#[test]
|
|
fn recursive_registration_downgrades_to_non_recursive_after_drop() {
|
|
let temp_dir = tempfile::tempdir().expect("temp dir");
|
|
let root = temp_dir.path().join("watched-dir");
|
|
std::fs::create_dir(&root).expect("create root");
|
|
|
|
let watcher = Arc::new(FileWatcher::new().expect("watcher"));
|
|
let (subscriber, _rx) = watcher.add_subscriber();
|
|
let non_recursive = subscriber.register_path(root.clone(), /*recursive*/ false);
|
|
let recursive = subscriber.register_path(root.clone(), /*recursive*/ true);
|
|
|
|
{
|
|
let inner = watcher.inner.as_ref().expect("watcher inner");
|
|
let inner = inner.lock().expect("inner lock");
|
|
assert_eq!(
|
|
inner.watched_paths.get(&root),
|
|
Some(&RecursiveMode::Recursive)
|
|
);
|
|
}
|
|
|
|
drop(recursive);
|
|
|
|
{
|
|
let inner = watcher.inner.as_ref().expect("watcher inner");
|
|
let inner = inner.lock().expect("inner lock");
|
|
assert_eq!(
|
|
inner.watched_paths.get(&root),
|
|
Some(&RecursiveMode::NonRecursive)
|
|
);
|
|
}
|
|
|
|
drop(non_recursive);
|
|
}
|
|
|
|
#[test]
|
|
fn unregister_holds_state_lock_until_unwatch_finishes() {
|
|
let temp_dir = tempfile::tempdir().expect("temp dir");
|
|
let root = temp_dir.path().join("watched-dir");
|
|
std::fs::create_dir(&root).expect("create root");
|
|
|
|
let watcher = Arc::new(FileWatcher::new().expect("watcher"));
|
|
let (unregister_subscriber, _unregister_rx) = watcher.add_subscriber();
|
|
let (register_subscriber, _register_rx) = watcher.add_subscriber();
|
|
let registration = unregister_subscriber.register_path(root.clone(), /*recursive*/ true);
|
|
|
|
let inner = watcher.inner.as_ref().expect("watcher inner");
|
|
let inner_guard = inner.lock().expect("inner lock");
|
|
|
|
let unregister_thread = std::thread::spawn(move || {
|
|
drop(registration);
|
|
});
|
|
|
|
let state_lock_observed = (0..100).any(|_| {
|
|
let locked = watcher.state.try_write().is_err();
|
|
if !locked {
|
|
std::thread::sleep(Duration::from_millis(10));
|
|
}
|
|
locked
|
|
});
|
|
assert_eq!(state_lock_observed, true);
|
|
|
|
let register_root = root.clone();
|
|
let register_thread = std::thread::spawn(move || {
|
|
let registration =
|
|
register_subscriber.register_path(register_root, /*recursive*/ false);
|
|
(register_subscriber, registration)
|
|
});
|
|
|
|
drop(inner_guard);
|
|
|
|
unregister_thread.join().expect("unregister join");
|
|
let (register_subscriber, non_recursive) = register_thread.join().expect("register join");
|
|
|
|
assert_eq!(watcher.watch_counts_for_test(&root), Some((1, 0)));
|
|
|
|
let inner = watcher.inner.as_ref().expect("watcher inner");
|
|
let inner = inner.lock().expect("inner lock");
|
|
assert_eq!(
|
|
inner.watched_paths.get(&root),
|
|
Some(&RecursiveMode::NonRecursive)
|
|
);
|
|
drop(inner);
|
|
|
|
drop(non_recursive);
|
|
drop(register_subscriber);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn matching_subscribers_are_notified() {
|
|
let watcher = Arc::new(FileWatcher::noop());
|
|
let (skills_subscriber, skills_rx) = watcher.add_subscriber();
|
|
let (plugins_subscriber, plugins_rx) = watcher.add_subscriber();
|
|
let _skills = skills_subscriber.register_path(path("/tmp/skills"), /*recursive*/ true);
|
|
let _plugins = plugins_subscriber.register_path(path("/tmp/plugins"), /*recursive*/ true);
|
|
let mut skills_rx = ThrottledWatchReceiver::new(skills_rx, TEST_THROTTLE_INTERVAL);
|
|
let mut plugins_rx = ThrottledWatchReceiver::new(plugins_rx, TEST_THROTTLE_INTERVAL);
|
|
|
|
watcher
|
|
.send_paths_for_test(vec![path("/tmp/skills/rust/SKILL.md")])
|
|
.await;
|
|
|
|
let skills_event = timeout(Duration::from_secs(1), skills_rx.recv())
|
|
.await
|
|
.expect("skills change timeout")
|
|
.expect("skills change");
|
|
assert_eq!(
|
|
skills_event,
|
|
FileWatcherEvent {
|
|
paths: vec![path("/tmp/skills/rust/SKILL.md")],
|
|
}
|
|
);
|
|
|
|
let plugins_event = timeout(TEST_THROTTLE_INTERVAL, plugins_rx.recv()).await;
|
|
assert_eq!(plugins_event.is_err(), true);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn non_recursive_watch_ignores_grandchildren() {
|
|
let watcher = Arc::new(FileWatcher::noop());
|
|
let (subscriber, rx) = watcher.add_subscriber();
|
|
let _registration = subscriber.register_path(path("/tmp/skills"), /*recursive*/ false);
|
|
let mut rx = ThrottledWatchReceiver::new(rx, TEST_THROTTLE_INTERVAL);
|
|
|
|
watcher
|
|
.send_paths_for_test(vec![path("/tmp/skills/nested/SKILL.md")])
|
|
.await;
|
|
|
|
let event = timeout(TEST_THROTTLE_INTERVAL, rx.recv()).await;
|
|
assert_eq!(event.is_err(), true);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn ancestor_events_notify_child_watches() {
|
|
let watcher = Arc::new(FileWatcher::noop());
|
|
let (subscriber, rx) = watcher.add_subscriber();
|
|
let _registration =
|
|
subscriber.register_path(path("/tmp/skills/rust/SKILL.md"), /*recursive*/ false);
|
|
let mut rx = ThrottledWatchReceiver::new(rx, TEST_THROTTLE_INTERVAL);
|
|
|
|
watcher.send_paths_for_test(vec![path("/tmp/skills")]).await;
|
|
|
|
let event = timeout(Duration::from_secs(1), rx.recv())
|
|
.await
|
|
.expect("ancestor event timeout")
|
|
.expect("ancestor event");
|
|
assert_eq!(
|
|
event,
|
|
FileWatcherEvent {
|
|
paths: vec![path("/tmp/skills")],
|
|
}
|
|
);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn spawn_event_loop_filters_non_mutating_events() {
|
|
let watcher = Arc::new(FileWatcher::noop());
|
|
let (subscriber, rx) = watcher.add_subscriber();
|
|
let _registration = subscriber.register_path(path("/tmp/skills"), /*recursive*/ true);
|
|
let mut rx = ThrottledWatchReceiver::new(rx, TEST_THROTTLE_INTERVAL);
|
|
let (raw_tx, raw_rx) = mpsc::unbounded_channel();
|
|
watcher.spawn_event_loop_for_test(raw_rx);
|
|
|
|
raw_tx
|
|
.send(Ok(notify_event(
|
|
EventKind::Access(AccessKind::Open(AccessMode::Any)),
|
|
vec![path("/tmp/skills/SKILL.md")],
|
|
)))
|
|
.expect("send access event");
|
|
let blocked = timeout(TEST_THROTTLE_INTERVAL, rx.recv()).await;
|
|
assert_eq!(blocked.is_err(), true);
|
|
|
|
raw_tx
|
|
.send(Ok(notify_event(
|
|
EventKind::Create(CreateKind::File),
|
|
vec![path("/tmp/skills/SKILL.md")],
|
|
)))
|
|
.expect("send create event");
|
|
let event = timeout(Duration::from_secs(1), rx.recv())
|
|
.await
|
|
.expect("create event timeout")
|
|
.expect("create event");
|
|
assert_eq!(
|
|
event,
|
|
FileWatcherEvent {
|
|
paths: vec![path("/tmp/skills/SKILL.md")],
|
|
}
|
|
);
|
|
}
|