Make gclient_scm_test much more silent

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."""
 
 # Import before super_mox to keep valid references.
 from os import rename
 from shutil import rmtree
@@ skipping 612 matching lines @@
     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\n\n\n'
+        ('\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') %
             gclient_scm.os.path.join(self.root_dir, '.'))
 
   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 = []
     scm.revert(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\n\n\n'
+      ('\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') %
             gclient_scm.os.path.join(self.root_dir, '.'))
 
   def testRevertModified(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 = gclient_scm.os.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\n\n\n'
+      ('\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') %
             gclient_scm.os.path.join(self.root_dir, '.'))
 
   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 = gclient_scm.os.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\n\n\n'
+      ('\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') %
             gclient_scm.os.path.join(self.root_dir, '.'))
 
   def testStatusNew(self):
     if not self.enabled:
       return
     options = self.Options()
     file_path = gclient_scm.os.path.join(self.base_path, 'a')
     open(file_path, 'a').writelines('touched\n')
@@ skipping 62 matching lines @@
     options = self.Options()
     expected_file_list = [gclient_scm.os.path.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)
     self.assertEquals(file_list, expected_file_list)
     self.assertEquals(scm.revinfo(options, (), None),
                       'a7142dc9f0009350b96a11f372b6ea658592aa95')
-    self.checkstdout('\n_____ . at refs/heads/master\n\n')
+    self.checkstdout(
+        '\n_____ . at refs/heads/master\n'
+        'Updating 069c602..a7142dc\nFast-forward\n a |    1 +\n b |    1 +\n'
+        ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n')
 
   def testUpdateUnstagedConflict(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_path = gclient_scm.os.path.join(self.base_path, 'b')
     f = open(file_path, 'w').writelines('conflict\n')
     exception = (
@@ skipping 56 matching lines @@
                                 relpath=self.relpath)
     rev_info = scm.revinfo(options, (), None)
     self.assertEquals(rev_info, '069c602044c5388d2d15c3f875b057c852003458')
     self.checkstdout('')
 
 
 if __name__ == '__main__':
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: