diff --git a/src/uu/cp/src/cp.rs b/src/uu/cp/src/cp.rs index b54c48140e..22c775784a 100644 --- a/src/uu/cp/src/cp.rs +++ b/src/uu/cp/src/cp.rs @@ -1457,8 +1457,10 @@ impl OverwriteMode { fn verify(&self, path: &Path) -> CopyResult<()> { match *self { Self::NoClobber => { + // TODO + // Revert to 1_i32 when "mv/update" is fixed show!(USimpleError::new( - 1_i32, + 0_i32, format!("not replacing {}", path.quote()) )); diff --git a/tests/by-util/test_cp.rs b/tests/by-util/test_cp.rs index 1614808cd5..e9ac7e99ae 100644 --- a/tests/by-util/test_cp.rs +++ b/tests/by-util/test_cp.rs @@ -594,7 +594,9 @@ fn test_cp_arg_interactive_verbose_no_clobber() { at.touch("a"); at.touch("b"); ucmd.args(&["-vin", "--debug", "a", "b"]) - .fails() + // TODO + // Revert to `fails` when "mv/update" is fixed + .run() .stderr_only("cp: not replacing 'b'\n"); } @@ -606,7 +608,9 @@ fn test_cp_no_clobber_existing_destination() { at.touch("b"); ucmd.args(&["--no-clobber", "a", "b"]) - .fails() + // TODO + // Revert to `fails` when "mv/update" is fixed + .run() .stderr_only("cp: not replacing 'b'\n"); } @@ -826,7 +830,9 @@ fn test_cp_arg_no_clobber() { .arg(TEST_HOW_ARE_YOU_SOURCE) .arg("--no-clobber") .arg("--debug") - .fails() + // TODO + // Revert to `fails` when "mv/update" is fixed + .run() .stderr_only("cp: not replacing 'how_are_you.txt'\n"); assert_eq!(at.read(TEST_HOW_ARE_YOU_SOURCE), "How are you?\n"); @@ -839,7 +845,9 @@ fn test_cp_arg_no_clobber_inferred_arg() { .arg(TEST_HOW_ARE_YOU_SOURCE) .arg("--no-clob") .arg("--debug") - .fails() + // TODO + // Revert to `fails` when "mv/update" is fixed + .run() .stderr_only("cp: not replacing 'how_are_you.txt'\n"); assert_eq!(at.read(TEST_HOW_ARE_YOU_SOURCE), "How are you?\n"); @@ -869,7 +877,9 @@ fn test_cp_arg_no_clobber_twice() { .arg("source.txt") .arg("dest.txt") .arg("--debug") - .fails() + // TODO + // Revert to `fails` when "mv/update" is fixed + .run() .stderr_only("cp: not replacing 'dest.txt'\n"); assert_eq!(at.read("source.txt"), "some-content"); @@ -1923,7 +1933,9 @@ fn test_cp_preserve_links_case_7() { .arg("src/f") .arg("src/g") .arg("dest") - .fails() + // TODO + // Revert to `fails` when "mv/update" is fixed + .run() .stderr_contains(expected_stderr) .stdout_contains(expected_stdout);