Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-27 05:23:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

add echo_env_mixed testbin to reduce windows only tests (#11172)

Browse source 
# Description
We have seen some test cases which requires to output message to both
stdout and stderr, especially in redirection scenario.

This pr is going to introduce a new echo_env_mixed testbin, so we can
have less tests which only runs on windows.

# User-Facing Changes
NaN

# Tests + Formatting
NaN

# After Submitting
NaN
This commit is contained in:
WindSoilder 2023-11-28 20:42:35 +08:00 committed by GitHub
parent fa83458a6d
commit 182b0ab4fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 110 additions and 169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

171
crates/nu-command/tests/commands/redirection.rs
View file

@ -2,85 +2,43 @@ use nu_test_support::fs::{file_contents, Stub::FileWithContent};
use nu_test_support::nu; use nu_test_support::nu;
use nu_test_support::playground::Playground; use nu_test_support::playground::Playground;
#[cfg(not(windows))]
#[test] #[test]
fn redirect_err() { fn redirect_err() {
Playground::setup("redirect_err_test", |dirs, _sandbox| { Playground::setup("redirect_err_test", |dirs, _sandbox| {
let output = nu!( let output = nu!(
cwd: dirs.test(), cwd: dirs.test(),
"cat asdfasdfasdf.txt err> a.txt; cat a.txt" r#"$env.BAZ = "asdfasdfasdf.txt"; nu --testbin echo_env_stderr BAZ err> a.txt; open a.txt"#
); );
assert!(output.out.contains("asdfasdfasdf.txt")); assert!(output.out.contains("asdfasdfasdf.txt"));
// check append mode // check append mode
let output = nu!( let output = nu!(
cwd: dirs.test(), cwd: dirs.test(),
"cat asdfasdfasdf.txt err>> a.txt; cat a.txt" r#"$env.BAZ = "asdfasdfasdf.txt"; nu --testbin echo_env_stderr BAZ err>> a.txt; open a.txt"#
); );
let v: Vec<_> = output.out.match_indices("asdfasdfasdf.txt").collect(); let v: Vec<_> = output.out.match_indices("asdfasdfasdf.txt").collect();
assert_eq!(v.len(), 2); assert_eq!(v.len(), 2);
}) })
} }
#[cfg(windows)]
#[test]
fn redirect_err() {
Playground::setup("redirect_err_test", |dirs, _sandbox| {
let output = nu!(
cwd: dirs.test(),
"vol missingdrive err> a; (open a | str stats).bytes >= 16"
);
assert!(output.out.contains("true"));
let output = nu!(
cwd: dirs.test(),
"vol missingdrive err>> a; (open a | str stats).bytes >= 32"
);
assert!(output.out.contains("true"));
})
}
#[cfg(not(windows))]
#[test] #[test]
fn redirect_outerr() { fn redirect_outerr() {
Playground::setup("redirect_outerr_test", |dirs, _sandbox| { Playground::setup("redirect_outerr_test", |dirs, _sandbox| {
nu!( let output = nu!(
cwd: dirs.test(), cwd: dirs.test(),
"cat asdfasdfasdf.txt out+err> a" r#"$env.BAZ = "asdfasdfasdf.txt"; nu --testbin echo_env_stderr BAZ out+err> a.txt; open a.txt"#
); );
let output = nu!(cwd: dirs.test(), "cat a");
assert!(output.out.contains("asdfasdfasdf.txt")); assert!(output.out.contains("asdfasdfasdf.txt"));
let output = nu!(cwd: dirs.test(), "cat asdfasdfasdf.txt o+e>> a; cat a"); let output = nu!(
cwd: dirs.test(),
r#"$env.BAZ = "asdfasdfasdf.txt"; nu --testbin echo_env_stderr BAZ o+e>> a.txt; open a.txt"#
);
let v: Vec<_> = output.out.match_indices("asdfasdfasdf.txt").collect(); let v: Vec<_> = output.out.match_indices("asdfasdfasdf.txt").collect();
assert_eq!(v.len(), 2); assert_eq!(v.len(), 2);
}) })
} }
#[cfg(windows)]
#[test]
fn redirect_outerr() {
Playground::setup("redirect_outerr_test", |dirs, _sandbox| {
nu!(
cwd: dirs.test(),
"vol missingdrive out+err> a"
);
let output = nu!(cwd: dirs.test(), "(open a | str stats).bytes >= 16");
assert!(output.out.contains("true"));
nu!(
cwd: dirs.test(),
"vol missingdrive out+err>> a"
);
let output = nu!(cwd: dirs.test(), "(open a | str stats).bytes >= 32");
assert!(output.out.contains("true"));
})
}
#[test] #[test]
fn redirect_out() { fn redirect_out() {
Playground::setup("redirect_out_test", |dirs, _sandbox| { Playground::setup("redirect_out_test", |dirs, _sandbox| {
@ -123,29 +81,13 @@ foobar"#);
fn separate_redirection() { fn separate_redirection() {
Playground::setup( Playground::setup(
"external with both stdout and stderr messages, to different file", "external with both stdout and stderr messages, to different file",
|dirs, sandbox| { |dirs, _| {
let script_body = r#"
echo message
echo message 1>&2
"#;
let expect_body = "message"; let expect_body = "message";
nu!(
cwd: dirs.test(),
r#"$env.BAZ = "message"; nu --testbin echo_env_mixed out-err BAZ BAZ o> out.txt e> err.txt"#,
);
#[cfg(not(windows))]
{
sandbox.with_files(vec![FileWithContent("test.sh", script_body)]);
nu!(
cwd: dirs.test(),
"bash test.sh out> out.txt err> err.txt"
);
}
#[cfg(windows)]
{
sandbox.with_files(vec![FileWithContent("test.bat", script_body)]);
nu!(
cwd: dirs.test(),
"cmd /D /c test.bat out> out.txt err> err.txt"
);
}
// check for stdout redirection file. // check for stdout redirection file.
let expected_out_file = dirs.test().join("out.txt"); let expected_out_file = dirs.test().join("out.txt");
let actual = file_contents(expected_out_file); let actual = file_contents(expected_out_file);
@ -155,12 +97,10 @@ fn separate_redirection() {
let expected_err_file = dirs.test().join("err.txt"); let expected_err_file = dirs.test().join("err.txt");
let actual = file_contents(expected_err_file); let actual = file_contents(expected_err_file);
assert!(actual.contains(expect_body)); assert!(actual.contains(expect_body));
#[cfg(not(windows))]
{
sandbox.with_files(vec![FileWithContent("test.sh", script_body)]);
nu!( nu!(
cwd: dirs.test(), cwd: dirs.test(),
"bash test.sh out>> out.txt err>> err.txt" r#"$env.BAZ = "message"; nu --testbin echo_env_mixed out-err BAZ BAZ o>> out.txt e>> err.txt"#,
); );
// check for stdout redirection file. // check for stdout redirection file.
let expected_out_file = dirs.test().join("out.txt"); let expected_out_file = dirs.test().join("out.txt");
@ -173,7 +113,6 @@ fn separate_redirection() {
let actual = file_contents(expected_err_file); let actual = file_contents(expected_err_file);
let v: Vec<_> = actual.match_indices("message").collect(); let v: Vec<_> = actual.match_indices("message").collect();
assert_eq!(v.len(), 2); assert_eq!(v.len(), 2);
}
}, },
) )
} }
@ -247,35 +186,30 @@ fn redirection_keep_exit_codes() {
) )
} }
#[cfg(not(windows))]
#[test] #[test]
fn redirection_with_pipeline_works() { fn redirection_with_pipeline_works() {
use nu_test_support::fs::{file_contents, Stub::FileWithContent}; use nu_test_support::fs::Stub::FileWithContent;
use nu_test_support::playground::Playground; use nu_test_support::playground::Playground;
Playground::setup( Playground::setup(
"external with stdout message with pipeline should write data", "external with stdout message with pipeline should write data",
|dirs, sandbox| { |dirs, sandbox| {
let script_body = r"echo message"; let script_body = r"echo message";
let expect_body = "message"; let expect_body = "message";
sandbox.with_files(vec![FileWithContent("test.sh", script_body)]); sandbox.with_files(vec![FileWithContent("test.sh", script_body)]);
nu!( let actual = nu!(
cwd: dirs.test(), cwd: dirs.test(),
"bash test.sh out> out.txt | describe" r#"$env.BAZ = "message"; nu --testbin echo_env BAZ out> out.txt | describe; open out.txt"#,
); );
// check for stdout redirection file. assert!(actual.out.contains(expect_body));
let expected_out_file = dirs.test().join("out.txt");
let actual = file_contents(expected_out_file);
assert!(actual.contains(expect_body));
// check append mode works // check append mode works
nu!( let actual = nu!(
cwd: dirs.test(), cwd: dirs.test(),
"bash test.sh o>> out.txt | describe" r#"$env.BAZ = "message"; nu --testbin echo_env BAZ out>> out.txt | describe; open out.txt"#,
); );
let expected_out_file = dirs.test().join("out.txt"); let v: Vec<_> = actual.out.match_indices("message").collect();
let actual = file_contents(expected_out_file);
let v: Vec<_> = actual.match_indices("message").collect();
assert_eq!(v.len(), 2); assert_eq!(v.len(), 2);
}, },
) )
@ -322,29 +256,15 @@ fn redirect_support_variable() {
fn separate_redirection_support_variable() { fn separate_redirection_support_variable() {
Playground::setup( Playground::setup(
"external with both stdout and stderr messages, to different file", "external with both stdout and stderr messages, to different file",
|dirs, sandbox| { |dirs, _| {
let script_body = r#"
echo message
echo message 1>&2
"#;
let expect_body = "message"; let expect_body = "message";
#[cfg(not(windows))]
{
sandbox.with_files(vec![FileWithContent("test.sh", script_body)]);
nu!( nu!(
cwd: dirs.test(), cwd: dirs.test(),
r#"let o_f = "out2.txt"; let e_f = "err2.txt"; bash test.sh out> $o_f err> $e_f"# r#"
let o_f = "out2.txt"
let e_f = "err2.txt"
$env.BAZ = "message"; nu --testbin echo_env_mixed out-err BAZ BAZ o> $o_f e> $e_f"#,
); );
}
#[cfg(windows)]
{
sandbox.with_files(vec![FileWithContent("test.bat", script_body)]);
nu!(
cwd: dirs.test(),
r#"let o_f = "out2.txt"; let e_f = "err2.txt"; cmd /D /c test.bat out> $o_f err> $e_f"#
);
}
// check for stdout redirection file. // check for stdout redirection file.
let expected_out_file = dirs.test().join("out2.txt"); let expected_out_file = dirs.test().join("out2.txt");
let actual = file_contents(expected_out_file); let actual = file_contents(expected_out_file);
@ -355,12 +275,12 @@ fn separate_redirection_support_variable() {
let actual = file_contents(expected_err_file); let actual = file_contents(expected_err_file);
assert!(actual.contains(expect_body)); assert!(actual.contains(expect_body));
#[cfg(not(windows))]
{
sandbox.with_files(vec![FileWithContent("test.sh", script_body)]);
nu!( nu!(
cwd: dirs.test(), cwd: dirs.test(),
r#"let o_f = "out2.txt"; let e_f = "err2.txt"; bash test.sh out>> $o_f err>> $e_f"# r#"
let o_f = "out2.txt"
let e_f = "err2.txt"
$env.BAZ = "message"; nu --testbin echo_env_mixed out-err BAZ BAZ out>> $o_f err>> $e_f"#,
); );
// check for stdout redirection file. // check for stdout redirection file.
let expected_out_file = dirs.test().join("out2.txt"); let expected_out_file = dirs.test().join("out2.txt");
@ -373,7 +293,6 @@ fn separate_redirection_support_variable() {
let actual = file_contents(expected_err_file); let actual = file_contents(expected_err_file);
let v: Vec<_> = actual.match_indices("message").collect(); let v: Vec<_> = actual.match_indices("message").collect();
assert_eq!(v.len(), 2); assert_eq!(v.len(), 2);
}
}, },
) )
} }
@ -401,43 +320,29 @@ fn redirection_should_have_a_target() {
} }
#[test] #[test]
#[cfg(not(windows))]
fn redirection_with_pipe() { fn redirection_with_pipe() {
use nu_test_support::fs::Stub::FileWithContent;
use nu_test_support::playground::Playground; use nu_test_support::playground::Playground;
Playground::setup( Playground::setup(
"external with many stdout and stderr messages", "external with many stdout and stderr messages",
|dirs, sandbox| { |dirs, _| {
let script_body = r#"
x=$(printf '=%.0s' {1..40})
echo -n $x
echo -n $x 1>&2
"#;
let mut expect_body = String::new();
for _ in 0..40 {
expect_body.push('=');
}
sandbox.with_files(vec![FileWithContent("test.sh", script_body)]);
// check for stdout // check for stdout
let actual = nu!( let actual = nu!(
cwd: dirs.test(), cwd: dirs.test(),
"bash test.sh err> tmp_file | str length", r#"$env.BAZ = "message"; nu --testbin echo_env_mixed out-err BAZ BAZ err> tmp_file | str length"#,
); );
assert_eq!(actual.out, "40"); assert_eq!(actual.out, "8");
// check for stderr redirection file. // check for stderr redirection file.
let expected_out_file = dirs.test().join("tmp_file"); let expected_out_file = dirs.test().join("tmp_file");
let actual_len = file_contents(expected_out_file).len(); let actual_len = file_contents(expected_out_file).len();
assert_eq!(actual_len, 40); assert_eq!(actual_len, 8);
// check it inside a function // check it inside a function
let actual = nu!( let actual = nu!(
cwd: dirs.test(), cwd: dirs.test(),
"bash test.sh err> tmp_file; print aa" r#"$env.BAZ = "message"; nu --testbin echo_env_mixed out-err BAZ BAZ err> tmp_file; print aa"#,
); );
assert!(actual.out.contains(&format!("{}aa", expect_body))); assert!(actual.out.contains("messageaa"));
}, },
) )
} }

1
src/main.rs
View file

@ -228,6 +228,7 @@ fn main() -> Result<()> {
match testbin.item.as_str() { match testbin.item.as_str() {
"echo_env" => test_bins::echo_env(true), "echo_env" => test_bins::echo_env(true),
"echo_env_stderr" => test_bins::echo_env(false), "echo_env_stderr" => test_bins::echo_env(false),
"echo_env_mixed" => test_bins::echo_env_mixed(),
"cococo" => test_bins::cococo(), "cococo" => test_bins::cococo(),
"meow" => test_bins::meow(), "meow" => test_bins::meow(),
"meowb" => test_bins::meowb(), "meowb" => test_bins::meowb(),

35
src/test_bins.rs
View file

@ -12,6 +12,11 @@ use std::io::{self, BufRead, Read, Write};
pub fn echo_env(to_stdout: bool) { pub fn echo_env(to_stdout: bool) {
let args = args(); let args = args();
for arg in args { for arg in args {
echo_one_env(&arg, to_stdout)
}
}
fn echo_one_env(arg: &str, to_stdout: bool) {
if let Ok(v) = std::env::var(arg) { if let Ok(v) = std::env::var(arg) {
if to_stdout { if to_stdout {
println!("{v}"); println!("{v}");
@ -20,6 +25,36 @@ pub fn echo_env(to_stdout: bool) {
} }
} }
} }
/// Mix echo of env keys from input
/// Example:
/// * nu --testbin echo_env_mixed out-err FOO BAR
/// * nu --testbin echo_env_mixed err-out FOO BAR
/// If it's not present, panic instead
pub fn echo_env_mixed() {
let args = args();
let args = &args[1..];
if args.len() != 3 {
panic!(
r#"Usage examples:
* nu --testbin echo_env_mixed out-err FOO BAR
* nu --testbin echo_env_mixed err-out FOO BAR"#
)
}
match args[0].as_str() {
"out-err" => {
let (out_arg, err_arg) = (&args[1], &args[2]);
echo_one_env(out_arg, true);
echo_one_env(err_arg, false);
}
"err-out" => {
let (err_arg, out_arg) = (&args[1], &args[2]);
echo_one_env(err_arg, false);
echo_one_env(out_arg, true);
}
_ => panic!("The mixed type must be `out_err`, `err_out`"),
}
} }
/// Cross platform echo using println!() /// Cross platform echo using println!()