Update CheckChangeSvnEolStyle() to be upload-friendly.

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_support.py and presubmit_canned_checks.py."""
 
 import exceptions
 import random
 import string
@@ skipping 995 matching lines @@
     input_api2.AffectedSourceFiles(None).AndReturn([affected_file2])
     input_api2.ReadFile(affected_file2, 'rb').AndReturn(content2)
     affected_file2.LocalPath().AndReturn('bar.cc')
     self.mox.ReplayAll()
 
     results = check(input_api1, presubmit.OutputApi)
     self.assertEquals(results, [])
     results2 = check(input_api2, presubmit.OutputApi)
     self.assertEquals(len(results2), 1)
     self.assertEquals(results2[0].__class__, error_type)
-  
+
+  def SvnPropertyTest(self, check, property, value1, value2, committing,
+                      error_type):
+    input_api1 = self.MockInputApi()
+    input_api1.is_committing = committing
+    files1 = [
+      presubmit.SvnAffectedFile('foo/bar.cc', 'A'),
+      presubmit.SvnAffectedFile('foo.cc', 'M'),
+    ]
+    input_api1.AffectedSourceFiles(None).AndReturn(files1)
+    presubmit.gcl.GetSVNFileProperty(presubmit.normpath('foo/bar.cc'),
+                                     property).AndReturn(value1)
+    presubmit.gcl.GetSVNFileProperty(presubmit.normpath('foo.cc'),
+                                     property).AndReturn(value1)
+    input_api2 = self.MockInputApi()
+    input_api2.is_committing = committing
+    files2 = [
+      presubmit.SvnAffectedFile('foo/bar.cc', 'A'),
+      presubmit.SvnAffectedFile('foo.cc', 'M'),
+    ]
+    input_api2.AffectedSourceFiles(None).AndReturn(files2)
+    presubmit.gcl.GetSVNFileProperty(presubmit.normpath('foo/bar.cc'),
+                                     property).AndReturn(value2)
+    presubmit.gcl.GetSVNFileProperty(presubmit.normpath('foo.cc'),
+                                     property).AndReturn(value2)
+    self.mox.ReplayAll()
+
+    results1 = check(input_api1, presubmit.OutputApi, None)
+    self.assertEquals(results1, [])
+    results2 = check(input_api2, presubmit.OutputApi, None)
+    self.assertEquals(len(results2), 1)
+    self.assertEquals(results2[0].__class__, error_type)
+
   def testCannedCheckChangeHasBugField(self):
     self.DescriptionTest(presubmit_canned_checks.CheckChangeHasBugField,
                          'Foo\nBUG=1234', 'Foo\n',
                          presubmit.OutputApi.PresubmitNotifyResult,
                          False)
 
   def testCheckChangeHasDescription(self):
     self.DescriptionTest(presubmit_canned_checks.CheckChangeHasDescription,
                          'Bleh', '',
                          presubmit.OutputApi.PresubmitNotifyResult,
@@ skipping 58 matching lines @@
   def testCannedCheckChangeHasNoTabs(self):
     self.ContentTest(presubmit_canned_checks.CheckChangeHasNoTabs,
                      'blah blah', 'blah\tblah',
                      presubmit.OutputApi.PresubmitPromptWarning)
 
   def testCannedCheckLongLines(self):
     check = lambda x,y,z: presubmit_canned_checks.CheckLongLines(x, y, 10, z)
     self.ContentTest(check, '', 'blah blah blah',
                      presubmit.OutputApi.PresubmitPromptWarning)
 
+  def testCheckChangeSvnEolStyleCommit(self):
+    self.SvnPropertyTest(presubmit_canned_checks.CheckChangeSvnEolStyle,
+                         'svn:eol-style', 'LF', '', True,
+                         presubmit.OutputApi.PresubmitError)
 
-  def testCheckChangeSvnEolStyle(self):
-    input_api1 = self.MockInputApi()
-    files1 = [
-      presubmit.SvnAffectedFile('foo/bar.cc', 'A'),
-      presubmit.SvnAffectedFile('foo.cc', 'M'),
-    ]
-    input_api1.AffectedSourceFiles(None).AndReturn(files1)
-    presubmit.gcl.GetSVNFileProperty(presubmit.normpath('foo/bar.cc'),
-                                     'svn:eol-style').AndReturn('LF')
-    presubmit.gcl.GetSVNFileProperty(presubmit.normpath('foo.cc'),
-                                     'svn:eol-style').AndReturn('LF')
-    input_api2 = self.MockInputApi()
-    files2 = [
-      presubmit.SvnAffectedFile('foo/bar.cc', 'A'),
-      presubmit.SvnAffectedFile('foo.cc', 'M'),
-    ]
-    input_api2.AffectedSourceFiles(None).AndReturn(files2)
-    presubmit.gcl.GetSVNFileProperty(presubmit.normpath('foo/bar.cc'),
-                                     'svn:eol-style').AndReturn('native')
-    presubmit.gcl.GetSVNFileProperty(presubmit.normpath('foo.cc'),
-                                     'svn:eol-style').AndReturn('CRLF')
-    self.mox.ReplayAll()
-
-    results1 = presubmit_canned_checks.CheckChangeSvnEolStyle(
-        input_api1, presubmit.OutputApi, None)
-    self.assertEquals(results1, [])
-    results2 = presubmit_canned_checks.CheckChangeSvnEolStyle(
-        input_api2, presubmit.OutputApi, None)
-    self.assertEquals(len(results2), 1)
-    self.assertEquals(results2[0].__class__, presubmit.OutputApi.PresubmitError)
+  def testCheckChangeSvnEolStyleUpload(self):
+    self.SvnPropertyTest(presubmit_canned_checks.CheckChangeSvnEolStyle,
+                         'svn:eol-style', 'LF', '', False,
+                         presubmit.OutputApi.PresubmitNotifyResult)
 
   def testCannedCheckTreeIsOpenOpen(self):
     input_api = self.MockInputApi()
     input_api.is_committing = True
     connection = self.mox.CreateMockAnything()
     input_api.urllib2.urlopen('url_to_open').AndReturn(connection)
     connection.read().AndReturn('1')
     connection.close()
     self.mox.ReplayAll()
     results = presubmit_canned_checks.CheckTreeIsOpen(
@@ skipping 152 matching lines @@
     test_result.errors = 0
     self.mox.ReplayAll()
 
     results = presubmit_canned_checks.RunPythonUnitTests(
         input_api, presubmit.OutputApi, ['test_module'])
     self.assertEquals(len(results), 0)
 
 
 if __name__ == '__main__':
   unittest.main()