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

Unified Diff: tests/checkout_test.py

Issue 795723003: Fix test failures on Ubuntu/Trusty. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 6 years 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 | « testing_support/fake_repos.py ('k') | tests/gclient_smoketest.py » ('j') | 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 e18db0a7cdbf286cba33a5c319f80d48da296cd9..97249065e6a36315e77c04f03dd978a6cc6ae5a4 100755
--- a/tests/checkout_test.py
+++ b/tests/checkout_test.py
@@ -515,12 +515,14 @@ class SvnCheckout(SvnBaseTest):
self.fail()
except checkout.PatchApplicationFailed, e:
self.assertEquals(e.filename, 'chrome/file.cc')
- self.assertEquals(
+ # The last line of the output depends on the svn version so we can't
+ # check it precisely
+ self.assertRegexpMatches(
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')
+ ' svn:.*')
co.prepare(None)
svn_props = [('svn:eol-style', 'LF'), ('foo', 'bar')]
co.apply_patch(
@@ -608,7 +610,8 @@ class SvnCheckout(SvnBaseTest):
env=env)
values = dict(l.split(': ', 1) for l in out.splitlines() if l)
expected = {
- 'Checksum': '65837bb3da662c8fa88a4a50940ea7c6',
+ # checksum seems to vary with svn version so we can't check it
+ #'Checksum': '65837bb3da662c8fa88a4a50940ea7c6',
'Copied From Rev': '2',
'Copied From URL':
'%strunk/chromeos/views/DOMui_menu_widget.h' % self.svn_base,
@@ -620,7 +623,9 @@ class SvnCheckout(SvnBaseTest):
'Schedule': 'add',
'URL': '%strunk/chromeos/views/webui_menu_widget.h' % self.svn_base,
}
- self.assertEquals(expected, values)
+ for key in expected:
+ self.assertIn(key, values)
+ self.assertEquals(expected[key], values[key])
class RawCheckout(SvnBaseTest):
« no previous file with comments | « testing_support/fake_repos.py ('k') | tests/gclient_smoketest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698