From e5979f970f552d0bb322503a8cc2ea579b13352f Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Tue, 28 Jul 2015 17:36:50 -0700 Subject: [PATCH] test_cli_cp: minor cleanup --- src/allmydata/test/test_cli_cp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/allmydata/test/test_cli_cp.py b/src/allmydata/test/test_cli_cp.py index 3c8bc80a9..7e8bb02f1 100644 --- a/src/allmydata/test/test_cli_cp.py +++ b/src/allmydata/test/test_cli_cp.py @@ -949,11 +949,11 @@ 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 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"]) + if err == "cannot copy multiple files with the same name into the same target directory": + return set(["E9-COLLIDING-TARGETS"]) self.fail("unrecognized error ('%s') %s" % (case, res)) d.addCallback(_check) return d