From: Brian Warner <warner@lothar.com>
Date: Wed, 29 Jul 2015 00:36:50 +0000 (-0700)
Subject: test_cli_cp: minor cleanup
X-Git-Tag: allmydata-tahoe-1.10.2b1~2^2
X-Git-Url: https://git.rkrishnan.org/(%5B%5E?a=commitdiff_plain;h=e5979f970f552d0bb322503a8cc2ea579b13352f;p=tahoe-lafs%2Ftahoe-lafs.git

test_cli_cp: minor cleanup
---

diff --git a/src/allmydata/test/test_cli_cp.py b/src/allmydata/test/test_cli_cp.py
index 3c8bc80a..7e8bb02f 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