Make sure warnings fail the check when may_prompt=False.

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 116 matching lines @@
 
 
 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',
+      'AffectedFile', 'Change', 'DetermineScm', 'DoGetTrySlaves',
+      'DoPresubmitChecks', 'GetTrySlavesExecuter', 'GitAffectedFile',
+      'GitChange', 'InputApi', 'ListRelevantPresubmitFiles', 'Main',
       'NotImplementedException', 'OutputApi', 'ParseFiles',
       'PresubmitExecuter', 'PresubmitOutput', 'ScanSubDirs',
       'SvnAffectedFile', 'SvnChange', 'cPickle', 'cStringIO',
       'exceptions', 'fnmatch', 'gclient_utils', 'glob', 'json',
       'logging', 'marshal', 'normpath', 'optparse', 'os', 'owners', 'pickle',
       'presubmit_canned_checks', 'random', 're', 'scm', 'subprocess',
       'sys', 'tempfile', 'time', 'traceback', 'types', 'unittest', 'urllib2',
       'warn',
     ]
     # If this test fails, you should add the relevant test.
@@ skipping 505 matching lines @@
     output = StringIO.StringIO()
     self.assertEqual(['win'],
                      presubmit.DoGetTrySlaves([filename], self.fake_root_dir,
                                               None, False, output))
     output = StringIO.StringIO()
     self.assertEqual(['win', 'linux'],
                      presubmit.DoGetTrySlaves([filename, filename_linux],
                                               self.fake_root_dir, None, False,
                                               output))
 
-  def testMain(self):
+  def testMainUnversioned(self):
     # OptParser calls presubmit.os.path.exists and is a pain when mocked.
     self.UnMock(presubmit.os.path, 'exists')
     self.mox.StubOutWithMock(presubmit, 'DoPresubmitChecks')
     self.mox.StubOutWithMock(presubmit, 'ParseFiles')
     presubmit.os.path.isdir(presubmit.os.path.join(self.fake_root_dir, '.svn')
         ).AndReturn(False)
     presubmit.os.path.isdir(presubmit.os.path.join(self.fake_root_dir, '.git')
         ).AndReturn(False)
     presubmit.subprocess.call(
         ['git', 'rev-parse', '--show-cdup'],
         cwd=self.fake_root_dir,
         stdout=presubmit.subprocess.PIPE).AndReturn(1)
+    presubmit.ParseFiles(['random_file.txt'], None
+        ).AndReturn(['random_file.txt'])
     output = self.mox.CreateMock(presubmit.PresubmitOutput)
     output.should_continue().AndReturn(False)
 
     presubmit.DoPresubmitChecks(mox.IgnoreArg(), False, False,
                                 mox.IgnoreArg(),
                                 mox.IgnoreArg(),
                                 None, False).AndReturn(output)
     self.mox.ReplayAll()
 
-    self.assertEquals(True,
-                      presubmit.Main(['presubmit', '--root',
-                                      self.fake_root_dir]))
+    self.assertEquals(
+        True,
+        presubmit.Main(['--root', self.fake_root_dir, 'random_file.txt']))
+
+  def testMainUnversionedFail(self):
+    # OptParser calls presubmit.os.path.exists and is a pain when mocked.
+    self.UnMock(presubmit.os.path, 'exists')
+    self.mox.StubOutWithMock(presubmit, 'DoPresubmitChecks')
+    self.mox.StubOutWithMock(presubmit, 'ParseFiles')
+    presubmit.os.path.isdir(presubmit.os.path.join(self.fake_root_dir, '.svn')
+        ).AndReturn(False)
+    presubmit.os.path.isdir(presubmit.os.path.join(self.fake_root_dir, '.git')
+        ).AndReturn(False)
+    presubmit.subprocess.call(
+        ['git', 'rev-parse', '--show-cdup'],
+        cwd=self.fake_root_dir,
+        stdout=presubmit.subprocess.PIPE).AndReturn(1)
+    self.mox.StubOutWithMock(presubmit.sys, 'stderr')
+    presubmit.sys.stderr.write(
+        'Usage: presubmit_unittest.py [options] <files...>\n')
+    presubmit.sys.stderr.write('\n')
+    presubmit.sys.stderr.write(
+        'presubmit_unittest.py: error: For unversioned directory, <files> is '
+        'not optional.\n')
+    self.mox.ReplayAll()
+
+    try:
+      presubmit.Main(['--root', self.fake_root_dir])
+      self.fail()
+    except SystemExit, e:
+      self.assertEquals(2, e.code)

[Dirk Pranke, 2011/03/17 19:12:56]

This is the sort of thing that makes mock testing really painful for me. The
test is so white-box it's translucent.

The way I'd write this test if I had the tools I do in webkit (like
filesystem_mock) and the code structured the way I'd like would be to pass in a
fake filesystem and a fake subprocess wrapper, and then simply test the result
of the call (and possible that something was written to stderr, but not test
what exactly). As it is, this test is incredibly fragile; change almost anything
in the implementation, and the test breaks. Oh well. No need to change this now.

 
 
 class InputApiUnittest(PresubmitTestsBase):
   """Tests presubmit.InputApi."""
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
       'AbsoluteLocalPaths', 'AffectedFiles', 'AffectedSourceFiles',
       'AffectedTextFiles',
       'DEFAULT_BLACK_LIST', 'DEFAULT_WHITE_LIST',
@@ skipping 1233 matching lines @@
 
   def testCannedCheckOwners_TBR(self):
     self.OwnersTest(is_committing=True, tbr=True,
         approvers=set(),
         uncovered_files=set(),
         expected_output='--tbr was specified, skipping OWNERS check\n')
 
 if __name__ == '__main__':
   import unittest
   unittest.main()