| 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):
|
|
|