From 418ce5f330697ed3f955984ef7bc1c0b9f911cd6 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 16 Sep 2024 09:39:30 -0400 Subject: [PATCH] test(completions): Verify nightly completion system This reverts commit 47f4cdc093e1ba6458665d639963ddc0cfc018d5. Fixes #14545 --- tests/testsuite/shell_completions.rs | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/tests/testsuite/shell_completions.rs b/tests/testsuite/shell_completions.rs index 2b96e266792..ba8e9e88b05 100644 --- a/tests/testsuite/shell_completions.rs +++ b/tests/testsuite/shell_completions.rs @@ -4,14 +4,8 @@ use cargo_test_support::cargo_test; use completest_pty::Runtime; use snapbox::assert_data_eq; -#[cargo_test] -#[ignore = "disabled, see https://github.com/rust-lang/cargo/issues/14545"] +#[cargo_test(requires_bash)] fn bash() { - // HACK: At least on CI, bash is not working on macOS - if cfg!(target_os = "macos") { - return; - } - let input = "cargo \t\t"; let expected = snapbox::str![ "% @@ -30,14 +24,8 @@ fn bash() { assert_data_eq!(actual, expected); } -#[cargo_test] -#[ignore = "disabled, see https://github.com/rust-lang/cargo/issues/14545"] +#[cargo_test(requires_elvish)] fn elvish() { - // HACK: At least on CI, elvish is not working on macOS - if cfg!(target_os = "macos") { - return; - } - let input = "cargo \t\t"; let expected = snapbox::str![ "% cargo --config @@ -57,14 +45,8 @@ fn elvish() { assert_data_eq!(actual, expected); } -#[cargo_test] -#[ignore = "disabled, see https://github.com/rust-lang/cargo/issues/14545"] +#[cargo_test(requires_fish)] fn fish() { - // HACK: At least on CI, fish is not working on macOS - if cfg!(target_os = "macos") { - return; - } - let input = "cargo \t\t"; let expected = snapbox::str![ "% cargo @@ -128,8 +110,7 @@ yank assert_data_eq!(actual, expected); } -#[cargo_test] -#[ignore = "disabled, see https://github.com/rust-lang/cargo/issues/14545"] +#[cargo_test(requires_zsh)] fn zsh() { let input = "cargo \t\t"; let expected = snapbox::str![