Modify presubmit checks to work on changed lines only.

tests/presubmit_unittest.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 presubmit_support.py and presubmit_canned_checks.py."""
 
 # pylint is too confused.
 # pylint: disable=E1101,E1103,W0212,W0403
 
@@ skipping 19 matching lines @@
     return [output_api.PresubmitPromptWarning("??"),
             output_api.PresubmitError("XX!!XX")]
   else:
     return ()
 """
   presubmit_tryslave = """
 def GetPreferredTrySlaves():
   return %s
 """
 
+  presubmit_diffs = """
+--- /tmp/file1  2011-02-08 21:35:31.998479201 -0800
++++ /tmp/file2  2011-02-08 21:36:50.487240201 -0800
+@@ -1,6 +1,5 @@
+ this is line number 0
+ this is line number 1
+-this is line number 2 to be deleted
+ this is line number 3
+ this is line number 4
+ this is line number 5
+@@ -8,7 +7,7 @@
+ this is line number 7
+ this is line number 8
+ this is line number 9
+-this is line number 10 to be modified
++this is line number 10
+ this is line number 11
+ this is line number 12
+ this is line number 13
+@@ -21,9 +20,8 @@
+ this is line number 20
+ this is line number 21
+ this is line number 22
+-this is line number 23
+-this is line number 24
+-this is line number 25
++this is line number 23.1
++this is line number 25.1
+ this is line number 26
+ this is line number 27
+ this is line number 28
+@@ -31,6 +29,7 @@
+ this is line number 30
+ this is line number 31
+ this is line number 32
++this is line number 32.1

[M-A Ruel, 2011/02/09 18:30:26]

Add a
+
on a single line to verify my concern about empty lines.

[vb, 2011/02/09 18:54:11]

Done.

+ this is line number 33
+ this is line number 34
+ this is line number 35
+"""
+
   def setUp(self):
     SuperMoxTestBase.setUp(self)
     self.mox.StubOutWithMock(presubmit, 'random')
     self.mox.StubOutWithMock(presubmit, 'warn')
     presubmit._ASKED_FOR_FEEDBACK = False
     self.fake_root_dir = self.RootDir()
     # Special mocks.
     def MockAbsPath(f):
       return f
     def MockChdir(f):
       return None
     # SuperMoxTestBase already mock these but simplify our life.
     presubmit.os.path.abspath = MockAbsPath
     presubmit.os.getcwd = self.RootDir
     presubmit.os.chdir = MockChdir
     self.mox.StubOutWithMock(presubmit.scm.SVN, 'CaptureInfo')
     self.mox.StubOutWithMock(presubmit.scm.SVN, 'GetFileProperty')
     self.mox.StubOutWithMock(presubmit.gclient_utils, 'FileRead')
     self.mox.StubOutWithMock(presubmit.gclient_utils, 'FileWrite')
+    self.mox.StubOutWithMock(presubmit.scm.SVN, 'GenerateDiff')
 
 
 class PresubmitUnittest(PresubmitTestsBase):
   """General presubmit_support.py tests (excluding InputApi and OutputApi)."""
 
   _INHERIT_SETTINGS = 'inherit-review-settings-ok'
 
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
@@ skipping 121 matching lines @@
         binary, 'svn:mime-type').AndReturn('application/octet-stream')
     presubmit.scm.SVN.GetFileProperty(
         notfound, 'svn:mime-type').AndReturn('')
     presubmit.scm.SVN.CaptureInfo(blat).AndReturn(
             {'URL': 'svn:/foo/foo/blat.cc'})
     presubmit.scm.SVN.CaptureInfo(binary).AndReturn(
         {'URL': 'svn:/foo/binary.dll'})
     presubmit.scm.SVN.CaptureInfo(notfound).AndReturn({})
     presubmit.scm.SVN.CaptureInfo(flap).AndReturn(
             {'URL': 'svn:/foo/boo/flap.h'})
-    presubmit.gclient_utils.FileRead(blat, 'rU').AndReturn('boo!\nahh?')
-    presubmit.gclient_utils.FileRead(notfound, 'rU').AndReturn('look!\nthere?')
+    presubmit.scm.SVN.GenerateDiff(blat).AndReturn(self.presubmit_diffs)
+    presubmit.scm.SVN.GenerateDiff(notfound).AndReturn(self.presubmit_diffs)
+
     self.mox.ReplayAll()
 
     change = presubmit.SvnChange('mychange', '\n'.join(description_lines),
                                  self.fake_root_dir, files, 0, 0)
     self.failUnless(change.Name() == 'mychange')
     self.failUnless(change.DescriptionText() ==
                     'Hello there\nthis is a change\nand some more regular text')
     self.failUnless(change.FullDescriptionText() ==
                     '\n'.join(description_lines))
 
@@ skipping 23 matching lines @@
     expected_paths.append('')  # one unknown file
     self.assertEqual(
       len(filter(lambda x: x in expected_paths, server_paths)), 4)
 
     files = [[x[0], presubmit.normpath(x[1])] for x in files]
 
     rhs_lines = []
     for line in change.RightHandSideLines():
       rhs_lines.append(line)
     self.assertEquals(rhs_lines[0][0].LocalPath(), files[0][1])
-    self.assertEquals(rhs_lines[0][1], 1)
-    self.assertEquals(rhs_lines[0][2],'boo!')
+    self.assertEquals(rhs_lines[0][1], 10)
+    self.assertEquals(rhs_lines[0][2],'this is line number 10')
 
-    self.assertEquals(rhs_lines[1][0].LocalPath(), files[0][1])
-    self.assertEquals(rhs_lines[1][1], 2)
-    self.assertEquals(rhs_lines[1][2], 'ahh?')
+    self.assertEquals(rhs_lines[3][0].LocalPath(), files[0][1])
+    self.assertEquals(rhs_lines[3][1], 32)
+    self.assertEquals(rhs_lines[3][2], 'this is line number 32.1')
 
-    self.assertEquals(rhs_lines[2][0].LocalPath(), files[3][1])
-    self.assertEquals(rhs_lines[2][1], 1)
-    self.assertEquals(rhs_lines[2][2], 'look!')
+    self.assertEquals(rhs_lines[5][0].LocalPath(), files[3][1])
+    self.assertEquals(rhs_lines[5][1], 23)
+    self.assertEquals(rhs_lines[5][2], 'this is line number 23.1')
 
-    self.assertEquals(rhs_lines[3][0].LocalPath(), files[3][1])
-    self.assertEquals(rhs_lines[3][1], 2)
-    self.assertEquals(rhs_lines[3][2], 'there?')
+    self.assertEquals(rhs_lines[6][0].LocalPath(), files[3][1])
+    self.assertEquals(rhs_lines[6][1], 24)
+    self.assertEquals(rhs_lines[6][2], 'this is line number 25.1')
 
   def testExecPresubmitScript(self):
     description_lines = ('Hello there',
                          'this is a change',
                          'STORY=http://tracker/123')
     files = [
       ['A', 'foo\\blat.cc'],
     ]
     fake_presubmit = presubmit.os.path.join(self.fake_root_dir, 'PRESUBMIT.py')
     self.mox.ReplayAll()
@@ skipping 435 matching lines @@
     presubmit.scm.SVN.CaptureInfo(beingdeleted).AndReturn({})
     presubmit.scm.SVN.CaptureInfo(notfound).AndReturn({})
     presubmit.scm.SVN.GetFileProperty(blat, 'svn:mime-type').AndReturn(None)
     presubmit.scm.SVN.GetFileProperty(readme, 'svn:mime-type').AndReturn(None)
     presubmit.scm.SVN.GetFileProperty(binary, 'svn:mime-type').AndReturn(
         'application/octet-stream')
     presubmit.scm.SVN.GetFileProperty(weird, 'svn:mime-type').AndReturn(None)
     presubmit.scm.SVN.GetFileProperty(another, 'svn:mime-type').AndReturn(None)
     presubmit.scm.SVN.GetFileProperty(third_party, 'svn:mime-type'
         ).AndReturn(None)
-    presubmit.gclient_utils.FileRead(blat, 'rU'
-                                     ).AndReturn('whatever\ncookie')
-    presubmit.gclient_utils.FileRead(another, 'rU'
-                                     ).AndReturn('whatever\ncookie2')
+    presubmit.scm.SVN.GenerateDiff(blat).AndReturn(self.presubmit_diffs)
+    presubmit.scm.SVN.GenerateDiff(another).AndReturn(self.presubmit_diffs)
+
     self.mox.ReplayAll()
 
     change = presubmit.SvnChange('mychange', '\n'.join(description_lines),
                                  self.fake_root_dir, files, 0, 0)
     input_api = presubmit.InputApi(change,
                                    join(self.fake_root_dir, 'foo',
                                         'PRESUBMIT.py'),
                                    False)
     # Doesn't filter much
     got_files = input_api.AffectedFiles()
     self.assertEquals(len(got_files), 7)
     self.assertEquals(got_files[0].LocalPath(), presubmit.normpath(files[0][1]))
     self.assertEquals(got_files[1].LocalPath(), presubmit.normpath(files[1][1]))
     self.assertEquals(got_files[2].LocalPath(), presubmit.normpath(files[2][1]))
     self.assertEquals(got_files[3].LocalPath(), presubmit.normpath(files[3][1]))
     self.assertEquals(got_files[4].LocalPath(), presubmit.normpath(files[4][1]))
     self.assertEquals(got_files[5].LocalPath(), presubmit.normpath(files[5][1]))
     self.assertEquals(got_files[6].LocalPath(), presubmit.normpath(files[6][1]))
     # Ignores weird because of whitelist, third_party because of blacklist,
     # binary isn't a text file and beingdeleted doesn't exist. The rest is
     # outside foo/.
     rhs_lines = [x for x in input_api.RightHandSideLines(None)]
-    self.assertEquals(len(rhs_lines), 4)
+    self.assertEquals(len(rhs_lines), 8)
     self.assertEqual(rhs_lines[0][0].LocalPath(),
                      presubmit.normpath(files[0][1]))
-    self.assertEqual(rhs_lines[1][0].LocalPath(),
+    self.assertEqual(rhs_lines[3][0].LocalPath(),
                      presubmit.normpath(files[0][1]))
-    self.assertEqual(rhs_lines[2][0].LocalPath(),
+    self.assertEqual(rhs_lines[4][0].LocalPath(),
                      presubmit.normpath(files[4][1]))
-    self.assertEqual(rhs_lines[3][0].LocalPath(),
+    self.assertEqual(rhs_lines[7][0].LocalPath(),
                      presubmit.normpath(files[4][1]))
 
   def testDefaultWhiteListBlackListFilters(self):
     def f(x):
       return presubmit.AffectedFile(x, 'M')
     files = [
       (
         [
           # To be tested.
           f('a/experimental/b'),
@@ skipping 253 matching lines @@
     input_buf = StringIO.StringIO('\n')
     warning = presubmit.OutputApi.PresubmitPromptWarning('???')
     self.failIf(warning._Handle(output, input_buf))
     self.failUnless(output.getvalue().count('???'))
 
 
 class AffectedFileUnittest(PresubmitTestsBase):
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
-      'AbsoluteLocalPath', 'Action', 'IsDirectory', 'IsTextFile', 'LocalPath',
-      'NewContents', 'OldContents', 'OldFileTempPath', 'Property', 'ServerPath',
+      'AbsoluteLocalPath', 'Action', 'ChangedContents', 'IsDirectory',
+      'IsTextFile', 'LocalPath', 'NewContents', 'OldContents',
+      'OldFileTempPath', 'Property', 'ServerPath',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(presubmit.AffectedFile('a', 'b'), members)
+    members.append('GenerateScmDiff')
     self.compareMembers(presubmit.SvnAffectedFile('a', 'b'), members)
 
   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()
@@ skipping 726 matching lines @@
     results = presubmit_canned_checks.CheckBuildbotPendingBuilds(
         input_api, presubmit.OutputApi, 'uurl', 2, ('foo'))
     self.assertEquals(len(results), 1)
     self.assertEquals(results[0].__class__,
         presubmit.OutputApi.PresubmitNotifyResult)
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()