Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1738)

Unified Diff: tests/checkout_test.py

Issue 7085022: Add support for auto-props in the form: "*.sh = svn:eol-style=LF;svn:executable" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Update comment to be clearer Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « checkout.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/checkout_test.py
diff --git a/tests/checkout_test.py b/tests/checkout_test.py
index 25c4b1461369deba31fca7a04685dde937c42b12..5707c7be66704f70f7cc3ccb981e4ed23bb5b20f 100755
--- a/tests/checkout_test.py
+++ b/tests/checkout_test.py
@@ -307,6 +307,7 @@ class SvnCheckout(SvnBaseTest):
def testException(self):
self._check_exception(
self._get_co(True),
+ 'While running patch -p1 --forward --force;\n'
'patching file svn_utils_test.txt\n'
'Hunk #1 FAILED at 3.\n'
'1 out of 1 hunk FAILED -- saving rejects to file '
@@ -325,8 +326,10 @@ class SvnCheckout(SvnBaseTest):
self.assertEquals(e.filename, 'svn_utils_test.txt')
self.assertEquals(
e.status,
- "patching file svn_utils_test.txt\n"
- "svn: Cannot set 'svn:ignore' on a file ('svn_utils_test.txt')\n")
+ 'While running svn propset svn:ignore foo svn_utils_test.txt '
+ '--non-interactive;\n'
+ 'patching file svn_utils_test.txt\n'
+ 'svn: Cannot set \'svn:ignore\' on a file (\'svn_utils_test.txt\')\n')
co.prepare()
svn_props = [('svn:eol-style', 'LF'), ('foo', 'bar')]
co.apply_patch(
« no previous file with comments | « checkout.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698