From f0fd34d16c367e4927dc5187d44ebee32ed765e6 Mon Sep 17 00:00:00 2001 From: Zooko Date: Tue, 16 Jun 2015 17:22:59 +0000 Subject: [PATCH] unit test for my desired behavior --- src/allmydata/test/test_cli_cp.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/allmydata/test/test_cli_cp.py b/src/allmydata/test/test_cli_cp.py index 65f4e4a1..82648307 100644 --- a/src/allmydata/test/test_cli_cp.py +++ b/src/allmydata/test/test_cli_cp.py @@ -788,10 +788,10 @@ cp -r $PARENTCAP/dir4 to : to/dir4/emptydir/ cp -r $PARENTCAP/dir4 to/ : to/dir4/emptydir/ # name collisions: ensure files are copied in order -cp -r $PARENTCAP/dir6/dir $PARENTCAP/dir5/dir to : to/dir/collide=5 -cp -r $PARENTCAP/dir5/dir $PARENTCAP/dir6/dir to : to/dir/collide=6 -cp -r $DIRCAP6 $DIRCAP5 to : to/dir/collide=5 -cp -r $DIRCAP5 $DIRCAP6 to : to/dir/collide=6 +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 +cp -r $DIRCAP5 $DIRCAP6 to : E9-COLLIDING-TARGETS """ @@ -949,6 +949,8 @@ 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": + return set(["E9-COLLIDING-TARGETS"]) if (err.startswith("source ") and "is not a directory, but ends with a slash" in err): return set(["E8-BADSLASH"]) -- 2.45.2