Restore 103787 (fix git progress message), and update test expectations.

tests/gclient_scm_test.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
@@ skipping 553 matching lines @@
                                 relpath=self.relpath)
     file_list = []
     scm.update(options, None, file_list)
     gclient_scm.os.remove(file_path)
     file_list = []
     scm.revert(options, self.args, file_list)
     self.assertEquals(file_list, [file_path])
     file_list = []
     scm.diff(options, self.args, file_list)
     self.assertEquals(file_list, [])
-    self.checkstdout(
-        ('\n_____ . at refs/heads/master\nUpdating 069c602..a7142dc\n'
+    expectation = ('\n_____ . at refs/heads/master\nUpdating 069c602..a7142dc\n'
          'Fast-forward\n a |    1 +\n b |    1 +\n'
          ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n\n'
          '________ running \'git reset --hard origin/master\' in \'%s\'\n'
-         'HEAD is now at a7142dc Personalized\n') %
-            join(self.root_dir, '.'))
+         'HEAD is now at a7142dc Personalized\n') % join(self.root_dir, '.')
+    self.assertTrue(sys.stdout.getvalue().startswith(expectation))
+    sys.stdout.close()
 
   def testRevertNone(self):
     if not self.enabled:
       return
     options = self.Options()
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     scm.update(options, None, file_list)
     file_list = []
@@ skipping 20 matching lines @@
     file_path = join(self.base_path, 'a')
     open(file_path, 'a').writelines('touched\n')
     file_list = []
     scm.revert(options, self.args, file_list)
     self.assertEquals(file_list, [file_path])
     file_list = []
     scm.diff(options, self.args, file_list)
     self.assertEquals(file_list, [])
     self.assertEquals(scm.revinfo(options, self.args, None),
                       'a7142dc9f0009350b96a11f372b6ea658592aa95')
-    self.checkstdout(
-      ('\n_____ . at refs/heads/master\nUpdating 069c602..a7142dc\n'
+    expectation = ('\n_____ . at refs/heads/master\nUpdating 069c602..a7142dc\n'
        'Fast-forward\n a |    1 +\n b |    1 +\n'
        ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n\n'
        '________ running \'git reset --hard origin/master\' in \'%s\'\n'
-       'HEAD is now at a7142dc Personalized\n') %
-            join(self.root_dir, '.'))
+       'HEAD is now at a7142dc Personalized\n') % join(self.root_dir, '.')
+    self.assertTrue(sys.stdout.getvalue().startswith(expectation))
+    sys.stdout.close()
 
   def testRevertNew(self):
     if not self.enabled:
       return
     options = self.Options()
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     scm.update(options, None, file_list)
     file_path = join(self.base_path, 'c')
     f = open(file_path, 'w')
     f.writelines('new\n')
     f.close()
     Popen(['git', 'add', 'c'], stdout=PIPE,
           stderr=STDOUT, cwd=self.base_path).communicate()
     file_list = []
     scm.revert(options, self.args, file_list)
     self.assertEquals(file_list, [file_path])
     file_list = []
     scm.diff(options, self.args, file_list)
     self.assertEquals(file_list, [])
     self.assertEquals(scm.revinfo(options, self.args, None),
                       'a7142dc9f0009350b96a11f372b6ea658592aa95')
-    self.checkstdout(
-      ('\n_____ . at refs/heads/master\nUpdating 069c602..a7142dc\n'
+    expectation = ('\n_____ . at refs/heads/master\nUpdating 069c602..a7142dc\n'
        'Fast-forward\n a |    1 +\n b |    1 +\n'
        ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n\n'
        '________ running \'git reset --hard origin/master\' in \'%s\'\n'
-       'HEAD is now at a7142dc Personalized\n') %
-            join(self.root_dir, '.'))
+       'HEAD is now at a7142dc Personalized\n') % join(self.root_dir, '.')
+    self.assertTrue(sys.stdout.getvalue().startswith(expectation))
+    sys.stdout.close()
 
   def testStatusNew(self):
     if not self.enabled:
       return
     options = self.Options()
     file_path = join(self.base_path, 'a')
     open(file_path, 'a').writelines('touched\n')
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
@@ skipping 38 matching lines @@
       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 = (
         "\n_____ foo at refs/heads/master\n\n"
-        "________ running 'git clone -b master --verbose %s %s' in '%s'\n"
+        "________ running 'git clone --progress -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"
+        "________ running 'git clone --progress -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'))
     out = sys.stdout.getvalue()
     sys.stdout.close()
     sys.stdout = self._old_stdout
     self.assertTrue(out in (msg1, msg2), (out, msg1, msg2))
 
@@ skipping 106 matching lines @@
       options.revision = 'unmanaged'
       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 = (
         "\n_____ foo at refs/heads/master\n\n"
-        "________ running 'git clone -b master --verbose %s %s' in '%s'\n"
+        "________ running 'git clone --progress -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"
+        "________ running 'git clone --progress -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'))
     out = sys.stdout.getvalue()
     sys.stdout.close()
     sys.stdout = self._old_stdout
     self.assertTrue(out in (msg1, msg2), (out, msg1, msg2))
 
@@ skipping 15 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: