Skip to content

Commit 79c0312

Browse files
committed
Address FIXME in test
1 parent 5a062ce commit 79c0312

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

tests/cli-misc.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -549,14 +549,12 @@ fn rls_exists_in_toolchain() {
549549
#[test]
550550
fn rls_does_not_exist_in_toolchain() {
551551
setup(&|config| {
552-
// FIXME: If rls exists in the toolchain, this should suggest a command
553-
// to run to install it
554552
expect_ok(config, &["rustup", "default", "stable"]);
555553
expect_err(
556554
config,
557555
&["rls", "--version"],
558556
&format!(
559-
"'rls{}' is not installed for the toolchain 'stable-{}'",
557+
"'rls{}' is not installed for the toolchain 'stable-{}'\nTo install, run `rustup component add rls`",
560558
EXE_SUFFIX,
561559
this_host_triple(),
562560
),

tests/cli-v2.rs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,17 @@ fn update_unavailable_force() {
843843
setup(&|config| {
844844
let ref trip = TargetTriple::from_build();
845845
expect_ok(config, &["rustup", "update", "nightly"]);
846-
expect_ok(config, &["rustup", "component", "add", "rls", "--toolchain", "nightly"]);
846+
expect_ok(
847+
config,
848+
&[
849+
"rustup",
850+
"component",
851+
"add",
852+
"rls",
853+
"--toolchain",
854+
"nightly",
855+
],
856+
);
847857
make_component_unavailable(config, "rls-preview", trip);
848858
expect_err(
849859
config,

0 commit comments

Comments
 (0)