presubmit_support: cache the result of ChangedContents.

tests/presubmit_unittest.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 presubmit_support.py and presubmit_canned_checks.py."""
 
 # pylint is too confused.
 # pylint: disable=E1101,E1103,R0201,W0212,W0403
 
@@ skipping 1197 matching lines @@
 
   def testAffectedFile(self):
     path = presubmit.os.path.join('foo', 'blat.cc')
     presubmit.os.path.exists(path).AndReturn(True)
     presubmit.os.path.isdir(path).AndReturn(False)
     presubmit.gclient_utils.FileRead(path, 'rU').AndReturn('whatever\ncookie')
     presubmit.scm.SVN.CaptureInfo(path).AndReturn(
         {'URL': 'svn:/foo/foo/blat.cc'})
     self.mox.ReplayAll()
     af = presubmit.SvnAffectedFile('foo/blat.cc', 'M')
-    self.failUnless(af.ServerPath() == 'svn:/foo/foo/blat.cc')
-    self.failUnless(af.LocalPath() == presubmit.normpath('foo/blat.cc'))
-    self.failUnless(af.Action() == 'M')
-    self.assertEquals(af.NewContents(), ['whatever', 'cookie'])
+    self.assertEquals('svn:/foo/foo/blat.cc', af.ServerPath())
+    self.assertEquals(presubmit.normpath('foo/blat.cc'), af.LocalPath())
+    self.assertEquals('M', af.Action())
+    self.assertEquals(['whatever', 'cookie'], af.NewContents())
+
+  def testAffectedFileNotExists(self):
+    presubmit.os.path.exists('notfound.cc').AndReturn(False)
+    presubmit.gclient_utils.FileRead('notfound.cc', 'rU').AndRaise(IOError)
+    self.mox.ReplayAll()
     af = presubmit.AffectedFile('notfound.cc', 'A')
-    self.failUnless(af.ServerPath() == '')
+    self.assertEquals('', af.ServerPath())
+    self.assertEquals([], af.NewContents())
 
   def testProperty(self):
     presubmit.scm.SVN.GetFileProperty('foo.cc', 'svn:secret-property'
         ).AndReturn('secret-property-value')
     self.mox.ReplayAll()
     affected_file = presubmit.SvnAffectedFile('foo.cc', 'A')
     # Verify cache coherency.
-    self.failUnless(affected_file.Property('svn:secret-property') ==
-                    'secret-property-value')
-    self.failUnless(affected_file.Property('svn:secret-property') ==
-                    'secret-property-value')
+    self.assertEquals('secret-property-value',
+                      affected_file.Property('svn:secret-property'))
+    self.assertEquals('secret-property-value',
+                      affected_file.Property('svn:secret-property'))
 
   def testIsDirectoryNotExists(self):
     presubmit.os.path.exists('foo.cc').AndReturn(False)
     presubmit.scm.SVN.CaptureInfo('foo.cc').AndReturn({})
     self.mox.ReplayAll()
     affected_file = presubmit.SvnAffectedFile('foo.cc', 'A')
     # Verify cache coherency.
     self.failIf(affected_file.IsDirectory())
     self.failIf(affected_file.IsDirectory())
 
@@ skipping 15 matching lines @@
     presubmit.os.path.exists(blat).AndReturn(True)
     presubmit.os.path.isdir(blat).AndReturn(False)
     presubmit.os.path.exists(blob).AndReturn(True)
     presubmit.os.path.isdir(blob).AndReturn(False)
     presubmit.scm.SVN.GetFileProperty(blat, 'svn:mime-type').AndReturn(None)
     presubmit.scm.SVN.GetFileProperty(blob, 'svn:mime-type'
         ).AndReturn('application/octet-stream')
     self.mox.ReplayAll()
 
     output = filter(lambda x: x.IsTextFile(), files)
-    self.failUnless(len(output) == 1)
-    self.failUnless(files[0] == output[0])
+    self.assertEquals(1, len(output))
+    self.assertEquals(files[0], output[0])
 
 
 class ChangeUnittest(PresubmitTestsBase):
   def testMembersChanged(self):
     members = [
         'AbsoluteLocalPaths', 'AffectedFiles', 'AffectedTextFiles',
         'DescriptionText', 'FullDescriptionText', 'LocalPaths', 'Name',
         'RepositoryRoot', 'RightHandSideLines', 'ServerPaths',
         'author_email', 'issue', 'patchset', 'scm', 'tags',
     ]
@@ skipping 856 matching lines @@
         whitelist=['^a$', '^b$'],
         blacklist=['a'])
     self.assertEqual(results, [])
     self.checkstdout(
         'Running %s\n' % presubmit.os.path.join('random_directory', 'b'))
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()