cp: error on target-filename collisions, rather than overwrite

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / test / test_cli_cp.py

diff --git a/src/allmydata/test/test_cli_cp.py b/src/allmydata/test/test_cli_cp.py
index 82648307ddff861d57c44ab35e646e2032b94eb7..3c8bc80a931232ec3205554cf172cb7bd335d3a0 100644 (file)
--- a/src/allmydata/test/test_cli_cp.py
+++ b/src/allmydata/test/test_cli_cp.py
@@ -787,7 +787,7 @@ cp -r $PARENTCAP/dir3/file3 $DIRCAP $PARENTCAP/dir2 $FILECAP to/missing/ : E2-DE
 cp -r $PARENTCAP/dir4 to  : to/dir4/emptydir/
 cp -r $PARENTCAP/dir4 to/ : to/dir4/emptydir/
 
-# name collisions: ensure files are copied in order
+# name collisions should cause errors, not overwrites
 cp -r $PARENTCAP/dir6/dir $PARENTCAP/dir5/dir to : E9-COLLIDING-TARGETS
 cp -r $PARENTCAP/dir5/dir $PARENTCAP/dir6/dir to : E9-COLLIDING-TARGETS
 cp -r $DIRCAP6 $DIRCAP5 to : E9-COLLIDING-TARGETS
@@ -949,7 +949,7 @@ class CopyOut(GridTestMixin, CLITestMixin, unittest.TestCase):
                     return set(["E6-MANYONE"])
                 if err == "target is not a directory, but ends with a slash":
                     return set(["E7-BADSLASH"])
-                if err == "cannot copy multiple files with the same name from different source directories into the same target directory":
+                if err == "cannot copy multiple files with the same name into the same target directory":
                     return set(["E9-COLLIDING-TARGETS"])
                 if (err.startswith("source ") and
                     "is not a directory, but ends with a slash" in err):