Fix test failures on Ubuntu/Trusty.

tests/checkout_test.py

Index: tests/checkout_test.py
diff --git a/tests/checkout_test.py b/tests/checkout_test.py
index e18db0a7cdbf286cba33a5c319f80d48da296cd9..de4a45fed1f5e5698053bb76c66c1f9a90d51d6f 100755
--- a/tests/checkout_test.py
+++ b/tests/checkout_test.py
@@ -11,6 +11,7 @@ import shutil
 import sys
 import unittest
 from xml.etree import ElementTree
+import pprint
 
 ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 sys.path.insert(0, os.path.dirname(ROOT_DIR))
@@ -515,12 +516,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 +611,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

[Sam Clegg, 2014/12/10 21:25:38]

New versions of svn also seem to include a lot more info here.

+      #'Checksum': '65837bb3da662c8fa88a4a50940ea7c6',
       'Copied From Rev': '2',
       'Copied From URL':
           '%strunk/chromeos/views/DOMui_menu_widget.h' % self.svn_base,
@@ -620,7 +624,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):