Look for PRESUBMIT.py beyond root if inherit-review-settings-ok is present.

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."""
 
 import StringIO
 
 # Fixes include path.
@@ skipping 39 matching lines @@
     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')
 
 
 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 = [
       'AffectedFile', 'Change', 'DoGetTrySlaves', 'DoPresubmitChecks',
       'GetTrySlavesExecuter', 'GitAffectedFile', 'GitChange',
       'InputApi', 'ListRelevantPresubmitFiles', 'Main',
       'NotImplementedException', 'OutputApi', 'ParseFiles',
       'PresubmitExecuter', 'PromptYesNo', 'ScanSubDirs',
       'SvnAffectedFile', 'SvnChange', 'cPickle', 'cStringIO',
       'exceptions', 'fnmatch', 'gcl', 'gclient_utils', 'glob', 'json',
       'logging', 'marshal', 'normpath', 'optparse', 'os', 'pickle',
       'presubmit_canned_checks', 'random', 're', 'scm', 'subprocess', 'sys',
       'tempfile', 'time', 'traceback', 'types', 'unittest', 'urllib2',
       'warnings',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(presubmit, members)
 
   def testListRelevantPresubmitFiles(self):
     join = presubmit.os.path.join
     files = [
       'blat.cc',
       join('foo', 'haspresubmit', 'yodle', 'smart.h'),
       join('moo', 'mat', 'gat', 'yo.h'),
       join('foo', 'luck.h'),
     ]
+    inherit_path = presubmit.os.path.join(self.fake_root_dir,
+                                          self._INHERIT_SETTINGS)
+    presubmit.os.path.isfile(inherit_path).AndReturn(False)
     presubmit.os.path.isfile(join(self.fake_root_dir,
                                   'PRESUBMIT.py')).AndReturn(True)
     presubmit.os.path.isfile(join(self.fake_root_dir, 'foo',
                                   'PRESUBMIT.py')).AndReturn(False)
     presubmit.os.path.isfile(join(self.fake_root_dir, 'foo', 'haspresubmit',
                                   'PRESUBMIT.py')).AndReturn(True)
     presubmit.os.path.isfile(join(self.fake_root_dir, 'foo', 'haspresubmit',
                                   'yodle', 'PRESUBMIT.py')).AndReturn(True)
     presubmit.os.path.isfile(join(self.fake_root_dir, 'moo',
                                   'PRESUBMIT.py')).AndReturn(False)
     presubmit.os.path.isfile(join(self.fake_root_dir, 'moo', 'mat',
                                   'PRESUBMIT.py')).AndReturn(False)
     presubmit.os.path.isfile(join(self.fake_root_dir, 'moo', 'mat', 'gat',
                                   'PRESUBMIT.py')).AndReturn(False)
     self.mox.ReplayAll()
 
     presubmit_files = presubmit.ListRelevantPresubmitFiles(files,
                                                            self.fake_root_dir)
     self.assertEqual(presubmit_files,
         [
           join(self.fake_root_dir, 'PRESUBMIT.py'),
           join(self.fake_root_dir, 'foo', 'haspresubmit', 'PRESUBMIT.py'),
           join(self.fake_root_dir, 'foo', 'haspresubmit', 'yodle',
                'PRESUBMIT.py')
         ])
 
+  def testListRelevantPresubmitFilesInheritSettings(self):
+    join = presubmit.os.path.join
+    sys_root_dir = self._OS_SEP
+    root_dir = join(sys_root_dir, 'foo', 'bar')
+    files = [
+      'test.cc',
+      join('moo', 'test2.cc'),
+      join('zoo', 'test3.cc')
+    ]
+    inherit_path = presubmit.os.path.join(root_dir, self._INHERIT_SETTINGS)
+    presubmit.os.path.isfile(inherit_path).AndReturn(True)
+    presubmit.os.path.isfile(join(sys_root_dir,
+                                  'PRESUBMIT.py')).AndReturn(False)
+    presubmit.os.path.isfile(join(sys_root_dir, 'foo',
+                                  'PRESUBMIT.py')).AndReturn(True)
+    presubmit.os.path.isfile(join(sys_root_dir, 'foo', 'bar',
+                                  'PRESUBMIT.py')).AndReturn(False)
+    presubmit.os.path.isfile(join(sys_root_dir, 'foo', 'bar', 'moo',
+                                  'PRESUBMIT.py')).AndReturn(True)
+    presubmit.os.path.isfile(join(sys_root_dir, 'foo', 'bar', 'zoo',
+                                  'PRESUBMIT.py')).AndReturn(False)
+    self.mox.ReplayAll()
+
+    presubmit_files = presubmit.ListRelevantPresubmitFiles(files, root_dir)
+    self.assertEqual(presubmit_files,
+        [
+          join(sys_root_dir, 'foo', 'PRESUBMIT.py'),
+          join(sys_root_dir, 'foo', 'bar', 'moo', 'PRESUBMIT.py')
+        ])
+
   def testTagLineRe(self):
     self.mox.ReplayAll()
     m = presubmit.Change._TAG_LINE_RE.match(' BUG =1223, 1445  \t')
     self.failUnless(m)
     self.failUnlessEqual(m.group('key'), 'BUG')
     self.failUnlessEqual(m.group('value'), '1223, 1445')
 
   def testGclChange(self):
     description_lines = ('Hello there',
                          'this is a change',
@@ skipping 157 matching lines @@
   def testDoPresubmitChecks(self):
     join = presubmit.os.path.join
     description_lines = ('Hello there',
                          'this is a change',
                          'STORY=http://tracker/123')
     files = [
       ['A', join('haspresubmit', 'blat.cc')],
     ]
     haspresubmit_path = join(self.fake_root_dir, 'haspresubmit', 'PRESUBMIT.py')
     root_path = join(self.fake_root_dir, 'PRESUBMIT.py')
+    inherit_path = presubmit.os.path.join(self.fake_root_dir,
+                                          self._INHERIT_SETTINGS)
+    presubmit.os.path.isfile(inherit_path).AndReturn(False)
     presubmit.os.path.isfile(root_path).AndReturn(True)
     presubmit.os.path.isfile(haspresubmit_path).AndReturn(True)
     presubmit.gclient_utils.FileRead(root_path,
                                      'rU').AndReturn(self.presubmit_text)
     presubmit.gclient_utils.FileRead(haspresubmit_path,
                                      'rU').AndReturn(self.presubmit_text)
     presubmit.random.randint(0, 4).AndReturn(1)
     self.mox.ReplayAll()
 
     output = StringIO.StringIO()
     input = StringIO.StringIO('y\n')
     change = presubmit.Change('mychange', '\n'.join(description_lines),
                               self.fake_root_dir, files, 0, 0)
     self.failIf(presubmit.DoPresubmitChecks(change, False, True, output, input,
                                             None, False))
     self.assertEqual(output.getvalue().count('!!'), 2)
 
   def testDoPresubmitChecksPromptsAfterWarnings(self):
     join = presubmit.os.path.join
     description_lines = ('Hello there',
                          'this is a change',
                          'NOSUCHKEY=http://tracker/123')
     files = [
       ['A', join('haspresubmit', 'blat.cc')],
     ]
     presubmit_path = join(self.fake_root_dir, 'PRESUBMIT.py')
     haspresubmit_path = join(self.fake_root_dir, 'haspresubmit', 'PRESUBMIT.py')
+    inherit_path = presubmit.os.path.join(self.fake_root_dir,
+                                          self._INHERIT_SETTINGS)
     for i in range(2):
+      presubmit.os.path.isfile(inherit_path).AndReturn(False)
       presubmit.os.path.isfile(presubmit_path).AndReturn(True)
       presubmit.os.path.isfile(haspresubmit_path).AndReturn(True)
       presubmit.gclient_utils.FileRead(presubmit_path, 'rU'
           ).AndReturn(self.presubmit_text)
       presubmit.gclient_utils.FileRead(haspresubmit_path, 'rU'
           ).AndReturn(self.presubmit_text)
     presubmit.random.randint(0, 4).AndReturn(1)
     presubmit.random.randint(0, 4).AndReturn(1)
     self.mox.ReplayAll()
 
@@ skipping 16 matching lines @@
     description_lines = ('Hello there',
                          'this is a change',
                          'NOSUCHKEY=http://tracker/123',
                          'REALLYNOSUCHKEY=http://tracker/123')
     files = [
       ['A', join('haspresubmit', 'blat.cc')],
     ]
     presubmit_path = join(self.fake_root_dir, 'PRESUBMIT.py')
     haspresubmit_path = join(self.fake_root_dir, 'haspresubmit',
                              'PRESUBMIT.py')
+    inherit_path = presubmit.os.path.join(self.fake_root_dir,
+                                          self._INHERIT_SETTINGS)
+    presubmit.os.path.isfile(inherit_path).AndReturn(False)
     presubmit.os.path.isfile(presubmit_path).AndReturn(True)
     presubmit.os.path.isfile(haspresubmit_path).AndReturn(True)
     presubmit.gclient_utils.FileRead(presubmit_path, 'rU'
                                      ).AndReturn(self.presubmit_text)
     presubmit.gclient_utils.FileRead(haspresubmit_path, 'rU').AndReturn(
         self.presubmit_text)
     presubmit.random.randint(0, 4).AndReturn(1)
     self.mox.ReplayAll()
 
     output = StringIO.StringIO()
@@ skipping 13 matching lines @@
                          'STORY=http://tracker/123')
     files = [
       ['A', join('haspresubmit', 'blat.cc')],
     ]
     DEFAULT_SCRIPT = """
 def CheckChangeOnUpload(input_api, output_api):
   return [output_api.PresubmitError("!!")]
 def CheckChangeOnCommit(input_api, output_api):
   raise Exception("Test error")
 """
+    inherit_path = presubmit.os.path.join(self.fake_root_dir,
+                                          self._INHERIT_SETTINGS)
+    presubmit.os.path.isfile(inherit_path).AndReturn(False)
     presubmit.os.path.isfile(join(self.fake_root_dir, 'PRESUBMIT.py')
         ).AndReturn(False)
     presubmit.os.path.isfile(join(self.fake_root_dir,
                                   'haspresubmit',
                                   'PRESUBMIT.py')).AndReturn(False)
     presubmit.random.randint(0, 4).AndReturn(0)
     self.mox.ReplayAll()
 
     output = StringIO.StringIO()
     input = StringIO.StringIO('y\n')
@@ skipping 55 matching lines @@
                                       input_api.change.DescriptionText())]
   if (input_api.change.FullDescriptionText() !=
       'Blah Blah\\n\\nSTORY=http://tracker.com/42\\nBUG=boo\\n'):
     return [output_api.PresubmitError('Tag parsing failed. 5 ' +
                                       input_api.change.FullDescriptionText())]
   return [output_api.PresubmitNotifyResult(input_api.change.tags['STORY'])]
 def CheckChangeOnCommit(input_api, output_api):
   raise Exception("Test error")
 """
     presubmit.random.randint(0, 4).AndReturn(1)
+    inherit_path = presubmit.os.path.join(self.fake_root_dir,
+                                          self._INHERIT_SETTINGS)
+    presubmit.os.path.isfile(inherit_path).AndReturn(False)
     self.mox.ReplayAll()
 
     output = StringIO.StringIO()
     input = StringIO.StringIO('y\n')
     change = presubmit.Change(
         'foo', "Blah Blah\n\nSTORY=http://tracker.com/42\nBUG=boo\n",
         self.fake_root_dir, None, 0, 0)
     self.failUnless(presubmit.DoPresubmitChecks(change, False, True, output,
                                                 input, DEFAULT_SCRIPT, False))
     self.assertEquals(output.getvalue(),
@@ skipping 26 matching lines @@
       self.assertEqual(result,
                        executer.ExecPresubmitScript(self.presubmit_tryslave %
                                                     str(result)))
 
   def testDoGetTrySlaves(self):
     join = presubmit.os.path.join
     filename = 'foo.cc'
     filename_linux = join('linux_only', 'penguin.cc')
     root_presubmit = join(self.fake_root_dir, 'PRESUBMIT.py')
     linux_presubmit = join(self.fake_root_dir, 'linux_only', 'PRESUBMIT.py')
+    inherit_path = presubmit.os.path.join(self.fake_root_dir,
+                                          self._INHERIT_SETTINGS)
 
+    presubmit.os.path.isfile(inherit_path).AndReturn(False)
     presubmit.os.path.isfile(root_presubmit).AndReturn(True)
     presubmit.gclient_utils.FileRead(root_presubmit, 'rU').AndReturn(
         self.presubmit_tryslave % '["win"]')
 
+    presubmit.os.path.isfile(inherit_path).AndReturn(False)
     presubmit.os.path.isfile(root_presubmit).AndReturn(True)
     presubmit.os.path.isfile(linux_presubmit).AndReturn(True)
     presubmit.gclient_utils.FileRead(root_presubmit, 'rU').AndReturn(
         self.presubmit_tryslave % '["win"]')
     presubmit.gclient_utils.FileRead(linux_presubmit, 'rU').AndReturn(
         self.presubmit_tryslave % '["linux"]')
     self.mox.ReplayAll()
 
     output = StringIO.StringIO()
     self.assertEqual(['win'],
@@ skipping 1082 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()