test_cli_cp: minor cleanup
authorBrian Warner <warner@lothar.com>
Wed, 29 Jul 2015 00:36:50 +0000 (17:36 -0700)
committerBrian Warner <warner@lothar.com>
Wed, 29 Jul 2015 00:39:26 +0000 (17:39 -0700)
src/allmydata/test/test_cli_cp.py

index 3c8bc80a931232ec3205554cf172cb7bd335d3a0..7e8bb02f1045bac0a4479d163b0cbaff1c05728b 100644 (file)
@@ -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