Support additional user presubmit scripts named PRESUBMIT*.py.

tests/presubmit_unittest.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 presubmit_support.py and presubmit_canned_checks.py."""
 
 # pylint: disable=E1101,E1103
 
 import StringIO
@@ skipping 199 matching lines @@
     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.listdir(self.fake_root_dir).AndReturn(['PRESUBMIT.py'])
     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)
+    presubmit.os.listdir(join(self.fake_root_dir, 'foo')).AndReturn([])
+    presubmit.os.listdir(join(self.fake_root_dir, 'foo',
+                              'haspresubmit')).AndReturn(['PRESUBMIT.py'])
+    presubmit.os.path.isfile(
+        join(self.fake_root_dir, 'foo', 'haspresubmit',
+             'PRESUBMIT.py')).AndReturn(True)
+    presubmit.os.listdir(
+        join(self.fake_root_dir, 'foo', 'haspresubmit', 'yodle')).AndReturn(
+            ['PRESUBMIT.py'])
+    presubmit.os.path.isfile(
+        join(self.fake_root_dir, 'foo', 'haspresubmit', 'yodle',
+             'PRESUBMIT.py')).AndReturn(True)
+    presubmit.os.listdir(join(self.fake_root_dir, 'moo')).AndReturn([])
+    presubmit.os.listdir(join(self.fake_root_dir, 'moo', 'mat')).AndReturn([])
+    presubmit.os.listdir(join(self.fake_root_dir, 'moo', 'mat',
+                              'gat')).AndReturn([])
     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 testListUserPresubmitFiles(self):
+    join = presubmit.os.path.join
+    files = ['blat.cc',]
+    inherit_path = presubmit.os.path.join(self.fake_root_dir,
+                                          self._INHERIT_SETTINGS)
+    presubmit.os.path.isfile(inherit_path).AndReturn(False)
+    presubmit.os.listdir(self.fake_root_dir).AndReturn(
+        ['PRESUBMIT.py', 'PRESUBMIT_test.py', 'PRESUBMIT-user.py'])
+    presubmit.os.path.isfile(join(self.fake_root_dir,
+                                  'PRESUBMIT.py')).AndReturn(True)
+    presubmit.os.path.isfile(join(self.fake_root_dir,
+                                  'PRESUBMIT_test.py')).AndReturn(True)
+    presubmit.os.path.isfile(join(self.fake_root_dir,
+                                  'PRESUBMIT-user.py')).AndReturn(True)
+    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, 'PRESUBMIT-user.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.listdir(sys_root_dir).AndReturn([])
+    presubmit.os.listdir(join(sys_root_dir, 'foo')).AndReturn(['PRESUBMIT.py'])
     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)
+    presubmit.os.listdir(join(sys_root_dir, 'foo', 'bar')).AndReturn([])
+    presubmit.os.listdir(join(sys_root_dir, 'foo', 'bar', 'moo')).AndReturn(
+        ['PRESUBMIT.py'])
+    presubmit.os.path.isfile(
+        join(sys_root_dir, 'foo', 'bar', 'moo', 'PRESUBMIT.py')).AndReturn(True)
+    presubmit.os.listdir(join(sys_root_dir, 'foo', 'bar', 'zoo')).AndReturn([])
     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):
@@ skipping 398 matching lines @@
                          '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.listdir(self.fake_root_dir).AndReturn(['PRESUBMIT.py'])
     presubmit.os.path.isfile(root_path).AndReturn(True)
+    presubmit.os.listdir(os.path.join(
+        self.fake_root_dir, 'haspresubmit')).AndReturn(['PRESUBMIT.py'])
     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()
 
     input_buf = StringIO.StringIO('y\n')
     change = presubmit.Change(
@@ skipping 18 matching lines @@
                          '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 _ in range(2):
       presubmit.os.path.isfile(inherit_path).AndReturn(False)
+      presubmit.os.listdir(self.fake_root_dir).AndReturn(['PRESUBMIT.py'])
       presubmit.os.path.isfile(presubmit_path).AndReturn(True)
+      presubmit.os.listdir(join(self.fake_root_dir, 'haspresubmit')).AndReturn(
+          ['PRESUBMIT.py'])
       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()
 
     input_buf = StringIO.StringIO('n\n')  # say no to the warning
@@ skipping 26 matching lines @@
                          '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.listdir(self.fake_root_dir).AndReturn(['PRESUBMIT.py'])
     presubmit.os.path.isfile(presubmit_path).AndReturn(True)
+    presubmit.os.listdir(join(self.fake_root_dir, 'haspresubmit')).AndReturn(
+        ['PRESUBMIT.py'])
     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()
 
     change = presubmit.Change(
         'mychange',
@@ skipping 21 matching lines @@
     ]
     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.listdir(join(self.fake_root_dir)
+        ).AndReturn([])
+    presubmit.os.listdir(join(self.fake_root_dir, 'haspresubmit')
+        ).AndReturn(['PRESUBMIT.py'])
     presubmit.os.path.isfile(join(self.fake_root_dir,
                                   'haspresubmit',
                                   'PRESUBMIT.py')).AndReturn(False)
     presubmit.random.randint(0, 4).AndReturn(0)
     self.mox.ReplayAll()
 
     input_buf = StringIO.StringIO('y\n')
     # Always fail.
     change = presubmit.Change(
         'mychange',
@@ skipping 166 matching lines @@
   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.listdir(self.fake_root_dir).AndReturn(['PRESUBMIT.py'])
     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.listdir(self.fake_root_dir).AndReturn(['PRESUBMIT.py'])
     presubmit.os.path.isfile(root_presubmit).AndReturn(True)
+    presubmit.os.listdir(join(self.fake_root_dir, 'linux_only')).AndReturn(
+        ['PRESUBMIT.py'])
     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()
 
     change = presubmit.Change(
         'mychange', '', self.fake_root_dir, [], 0, 0, None)
 
@@ skipping 81 matching lines @@
 
   def testDoGetTryMasters(self):
     root_text = (self.presubmit_trymaster
         % '{"t1.cr": {"win": set(["defaulttests"])}}')
     linux_text = (self.presubmit_trymaster
         % ('{"t1.cr": {"linux1": set(["t1"])},'
            ' "t2.cr": {"linux2": set(["defaulttests"])}}'))
 
     join = presubmit.os.path.join
     isfile = presubmit.os.path.isfile
+    listdir = presubmit.os.listdir
     FileRead = presubmit.gclient_utils.FileRead
     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 = join(self.fake_root_dir, self._INHERIT_SETTINGS)
 
     isfile(inherit_path).AndReturn(False)
+    listdir(self.fake_root_dir).AndReturn(['PRESUBMIT.py'])
     isfile(root_presubmit).AndReturn(True)
     FileRead(root_presubmit, 'rU').AndReturn(root_text)
 
     isfile(inherit_path).AndReturn(False)
+    listdir(self.fake_root_dir).AndReturn(['PRESUBMIT.py'])
     isfile(root_presubmit).AndReturn(True)
+    listdir(join(self.fake_root_dir, 'linux_only')).AndReturn(['PRESUBMIT.py'])
     isfile(linux_presubmit).AndReturn(True)
     FileRead(root_presubmit, 'rU').AndReturn(root_text)
     FileRead(linux_presubmit, 'rU').AndReturn(linux_text)
     self.mox.ReplayAll()
 
     change = presubmit.Change(
         'mychange', '', self.fake_root_dir, [], 0, 0, None)
 
     output = StringIO.StringIO()
     self.assertEqual({'t1.cr': {'win': ['defaulttests']}},
@@ skipping 1919 matching lines @@
         owners_check=False)
     self.assertEqual(2, len(results))
     self.assertEqual(
         'Found line ending with white spaces in:', results[0]._message)
     self.checkstdout('')
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()