Accept output from even more Git versions in tests.

tests/gclient_scm_test.py

 #!/usr/bin/python
 # Copyright (c) 2010 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 gclient_scm.py."""
 
 # pylint: disable=E1101,E1103,W0403
 
 # Import before super_mox to keep valid references.
 from os import rename
 from shutil import rmtree
 from subprocess import Popen, PIPE, STDOUT
 import tempfile
 import unittest
 import __builtin__
 
 # Fixes include path.
 from super_mox import mox, StdoutCheck, TestCaseUtils, SuperMoxTestBase
 
 import logging
+import re
 import sys
 import gclient_scm
 
 # Shortcut since this function is used often
 join = gclient_scm.os.path.join
 
 
 class GCBaseTestCase(object):
   def assertRaisesError(self, msg, fn, *args, **kwargs):
     """Like unittest's assertRaises() but checks for Gclient.Error."""
@@ skipping 699 matching lines @@
       scm = gclient_scm.CreateSCM(url=url, root_dir=root_dir,
                                   relpath=relpath)
       file_list = []
       scm.update(options, (), file_list)
       self.assertEquals(len(file_list), 2)
       self.assert_(gclient_scm.os.path.isfile(join(base_path, 'a')))
       self.assertEquals(scm.revinfo(options, (), None),
                         '069c602044c5388d2d15c3f875b057c852003458')
     finally:
       rmtree(root_dir)
-    msg1 = (
+    msg_re = re.compile(
         "\n_____ foo at refs/heads/master\n\n"
         "________ running 'git clone -b master --verbose %s %s' in '%s'\n"
-        "Initialized empty Git repository in %s\n") % (
-          join(self.root_dir, '.', '.git'),
-          join(root_dir, 'foo'),
-          root_dir,
-          join(gclient_scm.os.path.realpath(root_dir), 'foo', '.git') + '/')
-    msg2 = (
-        "\n_____ foo at refs/heads/master\n\n"
-        "________ running 'git clone -b master --verbose %s %s' in '%s'\n"
-        "Cloning into %s...\ndone.\n") % (
-          join(self.root_dir, '.', '.git'),
-          join(root_dir, 'foo'),
-          root_dir,
-          join(gclient_scm.os.path.realpath(root_dir), 'foo'))
+        "(Initialized empty Git repository in "
+        "|Cloning into )(%s|%s)(...\ndone.)?\n" % (
+          re.escape(join(self.root_dir, '.', '.git')),
+          re.escape(join(root_dir, 'foo')),
+          re.escape(root_dir),
+          re.escape(join(gclient_scm.os.path.realpath(root_dir),
+                         'foo', '.git')) + '/',
+          re.escape(join(root_dir, 'foo'))))
     out = sys.stdout.getvalue()
     sys.stdout.close()
-    self.assertTrue(out in (msg1, msg2), (out, msg1, msg2))
+    self.assertTrue(re.match(msg_re, out))

[evanm, 2011/02/28 22:35:11]

Might be better to just set the --quiet flag and rely on the exit code to test
success.

 
   def testUpdateUpdate(self):
     if not self.enabled:
       return
     options = self.Options()
     expected_file_list = [join(self.base_path, x) for x in ['a', 'b']]
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     scm.update(options, (), file_list)
@@ skipping 83 matching lines @@
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     logging.basicConfig(
         level=logging.DEBUG,
         format='%(asctime).19s %(levelname)s %(filename)s:'
                '%(lineno)s %(message)s')
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: