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

Unified Diff: tests/checkout_test.py

Issue 11028002: Make apply_issue.py much more verbose about what it's doing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Fix unit test Created 8 years, 3 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 | « patch.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 1c4d7fdd58066b2a8d278d3268feeca39b25c6ac..5486fac803f0357ec8329a4d4544d9e5be5777a5 100755
--- a/tests/checkout_test.py
+++ b/tests/checkout_test.py
@@ -308,9 +308,9 @@ class SvnCheckout(SvnBaseTest):
self._check_exception(
self._get_co(None),
'While running patch -p1 --forward --force --no-backup-if-mismatch;\n'
- 'patching file chrome/file.cc\n'
- 'Hunk #1 FAILED at 3.\n'
- '1 out of 1 hunk FAILED -- saving rejects to file '
+ ' patching file chrome/file.cc\n'
+ ' Hunk #1 FAILED at 3.\n'
+ ' 1 out of 1 hunk FAILED -- saving rejects to file '
'chrome/file.cc.rej\n')
def testSvnProps(self):
@@ -328,8 +328,8 @@ class SvnCheckout(SvnBaseTest):
e.status,
'While running svn propset svn:ignore foo chrome/file.cc '
'--non-interactive;\n'
- 'patching file chrome/file.cc\n'
- 'svn: Cannot set \'svn:ignore\' on a file (\'chrome/file.cc\')\n')
+ ' patching file chrome/file.cc\n'
+ ' svn: Cannot set \'svn:ignore\' on a file (\'chrome/file.cc\')\n')
co.prepare(None)
svn_props = [('svn:eol-style', 'LF'), ('foo', 'bar')]
co.apply_patch(
@@ -472,9 +472,10 @@ class RawCheckout(SvnBaseTest):
def testException(self):
self._check_exception(
self._get_co(None),
- 'patching file chrome/file.cc\n'
- 'Hunk #1 FAILED at 3.\n'
- '1 out of 1 hunk FAILED -- saving rejects to file '
+ 'While running patch -u --binary -p1;\n'
+ ' patching file chrome/file.cc\n'
+ ' Hunk #1 FAILED at 3.\n'
+ ' 1 out of 1 hunk FAILED -- saving rejects to file '
'chrome/file.cc.rej\n')
def testProcess(self):
@@ -514,9 +515,9 @@ class ReadOnlyCheckout(SvnBaseTest):
self._check_exception(
self._get_co(None),
'While running patch -p1 --forward --force --no-backup-if-mismatch;\n'
- 'patching file chrome/file.cc\n'
- 'Hunk #1 FAILED at 3.\n'
- '1 out of 1 hunk FAILED -- saving rejects to file '
+ ' patching file chrome/file.cc\n'
+ ' Hunk #1 FAILED at 3.\n'
+ ' 1 out of 1 hunk FAILED -- saving rejects to file '
'chrome/file.cc.rej\n')
def testProcess(self):
« no previous file with comments | « patch.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698