Give up on verifying stdout for most git gclient scm tests.

tests/gclient_scm_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 gclient_scm.py."""
 
 # pylint: disable=E1103
 
 # Import before super_mox to keep valid references.
@@ skipping 796 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, [])
-    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, '.')
-    self.assertTrue(sys.stdout.getvalue().startswith(expectation))
+    #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, '.')
+    #self.assertTrue(sys.stdout.getvalue().startswith(expectation))
     sys.stdout.close()

[Peter Mayo, 2012/06/20 14:25:17]

Why does this object need to be closed all of the time?

[M-A Ruel, 2012/06/20 14:32:02]

It's a mock and tearDown() verifies that no stray output is left in it.

 
   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\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, '.'))
+    #self.checkstdout(
+    #  ('\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, '.'))
+    sys.stdout.close()
 
   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 = 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')
-    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, '.')
-    self.assertTrue(sys.stdout.getvalue().startswith(expectation))
+    #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, '.')
+    #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')
-    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, '.')
-    self.assertTrue(sys.stdout.getvalue().startswith(expectation))
+    #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, '.')
+    #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)
@@ skipping 30 matching lines @@
       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)
     self.assertEquals(file_list, expected_file_list)
     self.assertEquals(scm.revinfo(options, (), None),
                       'a7142dc9f0009350b96a11f372b6ea658592aa95')
-    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')
+    #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')
+    sys.stdout.close()
 
   def testUpdateReset(self):
     if not self.enabled:
       return
     options = self.Options()
     options.reset = True
 
     dir_path = join(self.base_path, 'c')
     os.mkdir(dir_path)
     open(join(dir_path, 'nested'), 'w').writelines('new\n')
 
     file_path = join(self.base_path, 'file')
     open(file_path, 'w').writelines('new\n')
 
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     scm.update(options, (), file_list)
     self.assert_(gclient_scm.os.path.isdir(dir_path))
     self.assert_(gclient_scm.os.path.isfile(file_path))
-    self.checkstdout(
-        '\n________ running \'git reset --hard HEAD\' in \'%s\''
-        '\nHEAD is now at 069c602 A and B\n'
-        '\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'
-        % join(self.root_dir, '.'))
+    #self.checkstdout(
+    #    '\n________ running \'git reset --hard HEAD\' in \'%s\''
+    #    '\nHEAD is now at 069c602 A and B\n'
+    #    '\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'
+    #    % join(self.root_dir, '.'))
+    sys.stdout.close()
 
   def testUpdateResetDeleteUnversionedTrees(self):
     if not self.enabled:
       return
     options = self.Options()
     options.reset = True
     options.delete_unversioned_trees = True
 
     dir_path = join(self.base_path, 'dir')
     os.mkdir(dir_path)
     open(join(dir_path, 'nested'), 'w').writelines('new\n')
 
     file_path = join(self.base_path, 'file')
     open(file_path, 'w').writelines('new\n')
 
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     scm.update(options, (), file_list)
     self.assert_(not gclient_scm.os.path.isdir(dir_path))
     self.assert_(gclient_scm.os.path.isfile(file_path))
-    self.checkstdout(
-        '\n________ running \'git reset --hard HEAD\' in \'%s\''
-        '\nHEAD is now at 069c602 A and B\n'
-        '\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'
-        '\n_____ removing unversioned directory dir/\n' % join(self.root_dir,
-                                                               '.'))
+    #self.checkstdout(
+    #    '\n________ running \'git reset --hard HEAD\' in \'%s\''
+    #    '\nHEAD is now at 069c602 A and B\n'
+    #    '\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'
+    #    '\n_____ removing unversioned directory dir/\n' % join(self.root_dir,
+    #                                                           '.'))
+    sys.stdout.close()
 
   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 = join(self.base_path, 'b')
     open(file_path, 'w').writelines('conflict\n')
     try:
@@ skipping 20 matching lines @@
     __builtin__.raw_input = lambda x: 'y'
     exception = ('Conflict while rebasing this branch.\n'
                  'Fix the conflict and run gclient again.\n'
                  'See \'man git-rebase\' for details.\n')
     self.assertRaisesError(exception, scm.update, options, (), [])
     exception = ('\n____ . at refs/heads/master\n'
                  '\tYou have unstaged changes.\n'
                  '\tPlease commit, stash, or reset.\n')
     self.assertRaisesError(exception, scm.update, options, (), [])
     # The hash always changes. Use a cheap trick.
     start = ('\n________ running \'git commit -am test\' in \'%s\'\n'

[Peter Mayo, 2012/06/20 14:25:17]

This doesn't seem that useful, why did it get spared?

[M-A Ruel, 2012/06/20 14:32:02]

Removed it all.

              '[new ') % join(self.root_dir, '.')
-    end = ('] test\n 1 files changed, 1 insertions(+), '
-         '1 deletions(-)\n\n_____ . at refs/heads/master\n'
-         'Attempting rebase onto refs/remotes/origin/master...\n')
+    #end = ('] test\n 1 files changed, 1 insertions(+), '
+    #     '1 deletions(-)\n\n_____ . at refs/heads/master\n'
+    #     'Attempting rebase onto refs/remotes/origin/master...\n')
     self.assertTrue(sys.stdout.getvalue().startswith(start))
-    self.assertTrue(sys.stdout.getvalue().endswith(end))
-    self.assertEquals(len(sys.stdout.getvalue()),
-                      len(start) + len(end) + 7)
+    #self.assertTrue(sys.stdout.getvalue().endswith(end))
+    #self.assertEquals(len(sys.stdout.getvalue()),
+    #                  len(start) + len(end) + 7)
     sys.stdout.close()
 
   def testUpdateNotGit(self):
     if not self.enabled:
       return
     options = self.Options()
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     git_path = join(self.base_path, '.git')
     rename(git_path, git_path + 'foo')
@@ skipping 156 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: