Fix test failures on Ubuntu/Trusty.

tests/checkout_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for checkout.py."""
 
 import logging
 import os
 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))
 
 from testing_support import fake_repos
 from testing_support.patches_data import GIT, RAW
 
 import checkout
 import patch
 import subprocess2
@@ skipping 484 matching lines @@
     co = self._get_co(None)
     co.prepare(None)
     try:
       # svn:ignore can only be applied to directories.
       svn_props = [('svn:ignore', 'foo')]
       co.apply_patch(
           [patch.FilePatchDiff('chrome/file.cc', RAW.PATCH, svn_props)])
       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(
         [patch.FilePatchDiff('chrome/file.cc', RAW.PATCH, svn_props)])
     filepath = os.path.join(self.root_dir, self.name, 'chrome/file.cc')
     # Manually verify the properties.
     props = subprocess2.check_output(
         ['svn', 'proplist', filepath],
         cwd=self.root_dir).splitlines()[1:]
     props = sorted(p.strip() for p in props)
@@ skipping 67 matching lines @@
     self.assertEquals(expected, out)
     # Make sure ancestry is what is expected;
     env = os.environ.copy()
     env['LANGUAGE'] = 'en_US.UTF-8'
     out = subprocess2.check_output(
         ['svn', 'info', 'chromeos/views/webui_menu_widget.h'],
         cwd=co.project_path,
         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,
       'Name': 'webui_menu_widget.h',
       'Node Kind': 'file',
       'Path': 'chromeos/views/webui_menu_widget.h',
       'Repository Root': '%s' % self.svn_base.rstrip('/'),
       'Revision': '2',
       '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):
   def setUp(self):
     super(RawCheckout, self).setUp()
     # Use a svn checkout as the base.
     self.base_co = checkout.SvnCheckout(
         self.root_dir, self.name, None, None, self.svn_url)
     self.base_co.prepare(None)
 
@@ skipping 94 matching lines @@
   if '-v' in sys.argv:
     DEBUGGING = True
     logging.basicConfig(
         level=logging.DEBUG,
         format='%(levelname)5s %(filename)15s(%(lineno)3d): %(message)s')
   else:
     logging.basicConfig(
         level=logging.ERROR,
         format='%(levelname)5s %(filename)15s(%(lineno)3d): %(message)s')
   unittest.main()