Add an optional flag to gcl.ReadFile() so that presubmit can support CRLF PRE...

depot_tools/tests/presubmit_unittest.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 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.py and presubmit_canned_checks.py."""
 
 import os
 import StringIO
 import unittest
@@ skipping 35 matching lines @@
       elif path.count('binary'):
         return 'application/octet-stream'
       else:
         if len(path) % 2:
           return 'text/plain'
         else:
           return ''
     gcl.GetSVNFileProperty = MockGetSVNFileProperty
 
     self.original_ReadFile = gcl.ReadFile
-    def MockReadFile(path):
+    def MockReadFile(path, dummy='r'):
       if path.count('nosuchfile'):
         return None
       elif path.endswith('isdir'):
         self.fail('Should not attempt to read file that is directory.')
       elif path.endswith('PRESUBMIT.py'):
         # used in testDoPresubmitChecks
         return ('def CheckChangeOnUpload(input_api, output_api):\n'
                 '  if not input_api.change.NOSUCHKEY:\n'
                 '    return [output_api.PresubmitError("!!")]\n'
                 '  elif not input_api.change.REALLYNOSUCHKEY:\n'
@@ skipping 590 matching lines @@
     self.failIf(presubmit_canned_checks.CheckTreeIsOpen(
       self.MockInputApi(), presubmit.OutputApi, url='url_to_open', closed='0'
     ))
     self.failUnless(presubmit_canned_checks.CheckTreeIsOpen(
       self.MockInputApi(), presubmit.OutputApi, url='url_to_closed', closed='0'
     ))
 
 
 if __name__ == '__main__':
   unittest.main()