Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cp: -i prompts in the right place and other improv #4925

Merged
merged 2 commits into from
Jun 2, 2023

Conversation

sylvestre
Copy link
Contributor

No description provided.

@github-actions
Copy link

GNU testsuite comparison:

Congrats! The gnu test tests/cp/cp-i is no longer failing!
Congrats! The gnu test tests/rm/rm2 is no longer failing!

Comment on lines 447 to 469
fn test_cp_arg_interactive_update() {
// -u -i won't show the prompt to validate the override or not
// Therefore, the error code will be 0
fn test_cp_arg_interactive_verbose() {
let (at, mut ucmd) = at_and_ucmd!();
at.touch("a");
at.touch("b");
ucmd.args(&["-i", "-u", "a", "b"])
ucmd.args(&["-vi", "a", "b"])
.pipe_in("N\n")
.succeeds()
.no_stdout();
.fails()
.stdout_is("skipped 'b'\n");
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the reason for replacing the -iu-test with a -vi-test?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo, let me fix that :)

@sylvestre sylvestre force-pushed the cp-i branch 2 times, most recently from 240b247 to a2e8004 Compare June 1, 2023 06:23
@github-actions
Copy link

github-actions bot commented Jun 1, 2023

GNU testsuite comparison:

Congrats! The gnu test tests/cp/cp-i is no longer failing!

tests/by-util/test_cp.rs Outdated Show resolved Hide resolved
src/uu/cp/src/cp.rs Outdated Show resolved Hide resolved
@github-actions
Copy link

github-actions bot commented Jun 1, 2023

GNU testsuite comparison:

Congrats! The gnu test tests/cp/cp-i is no longer failing!

@cakebaker cakebaker merged commit d2bf531 into uutils:main Jun 2, 2023
@sylvestre sylvestre deleted the cp-i branch June 2, 2023 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants