Skip to content

Commit 98daf86

Browse files
committed
Port cli_inst_interactive to CliTestContext
1 parent 97dd0be commit 98daf86

File tree

1 file changed

+7
-19
lines changed

1 file changed

+7
-19
lines changed

tests/suite/cli_inst_interactive.rs

+7-19
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,7 @@ Default host triple? [{0}]
167167
#[test]
168168
fn installer_shows_default_toolchain_as_stable() {
169169
let cx = CliTestContext::from(Scenario::SimpleV2);
170-
let out = run_input(
171-
&cx.config,
172-
&["rustup-init", "--no-modify-path"],
173-
"2\n\n",
174-
);
170+
let out = run_input(&cx.config, &["rustup-init", "--no-modify-path"], "2\n\n");
175171

176172
println!("-- stdout --\n {}", out.stdout);
177173
println!("-- stderr --\n {}", out.stderr);
@@ -207,11 +203,7 @@ Default toolchain? (stable/beta/nightly/none) [nightly]
207203
#[test]
208204
fn installer_shows_default_profile() {
209205
let cx = CliTestContext::from(Scenario::SimpleV2);
210-
let out = run_input(
211-
&cx.config,
212-
&["rustup-init", "--no-modify-path"],
213-
"2\n\n\n",
214-
);
206+
let out = run_input(&cx.config, &["rustup-init", "--no-modify-path"], "2\n\n\n");
215207

216208
println!("-- stdout --\n {}", out.stdout);
217209
println!("-- stderr --\n {}", out.stderr);
@@ -275,11 +267,7 @@ Modify PATH variable? (y/N)
275267
#[test]
276268
fn user_says_nope() {
277269
let cx = CliTestContext::from(Scenario::SimpleV2);
278-
let out = run_input(
279-
&cx.config,
280-
&["rustup-init", "--no-modify-path"],
281-
"n\n\n",
282-
);
270+
let out = run_input(&cx.config, &["rustup-init", "--no-modify-path"], "n\n\n");
283271
assert!(out.ok);
284272
assert!(!cx.config.cargodir.join("bin").exists());
285273
}
@@ -470,7 +458,7 @@ fn test_prompt_fail_if_rustup_sh_already_installed_reply_nothing() {
470458
fn test_prompt_fail_if_rustup_sh_already_installed_reply_no() {
471459
let cx = CliTestContext::from(Scenario::SimpleV2);
472460
cx.config.create_rustup_sh_metadata();
473-
let out = run_input(&mut cx.config, &["rustup-init", "--no-modify-path"], "no\n");
461+
let out = run_input(&cx.config, &["rustup-init", "--no-modify-path"], "no\n");
474462
assert!(!out.ok);
475463
assert!(out
476464
.stderr
@@ -483,10 +471,10 @@ fn test_prompt_fail_if_rustup_sh_already_installed_reply_no() {
483471

484472
#[test]
485473
fn test_prompt_succeed_if_rustup_sh_already_installed_reply_yes() {
486-
let mut cx = CliTestContext::from(Scenario::SimpleV2);
474+
let cx = CliTestContext::from(Scenario::SimpleV2);
487475
cx.config.create_rustup_sh_metadata();
488476
let out = run_input(
489-
&mut cx.config,
477+
&cx.config,
490478
&["rustup-init", "--no-modify-path"],
491479
"yes\n\n\n",
492480
);
@@ -508,7 +496,7 @@ fn installing_when_already_installed_updates_toolchain() {
508496
let mut cx = CliTestContext::from(Scenario::SimpleV2);
509497
cx.config
510498
.expect_ok(&["rustup-init", "-y", "--no-modify-path"]);
511-
let out = run_input(&mut cx.config, &["rustup-init", "--no-modify-path"], "\n\n");
499+
let out = run_input(&cx.config, &["rustup-init", "--no-modify-path"], "\n\n");
512500
println!("stdout:\n{}\n...\n", out.stdout);
513501
assert!(out
514502
.stdout

0 commit comments

Comments
 (0)