Allow the existence of ~/.gcl_upload_no_try override the default of try on up...

tests/gcl_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 gcl.py."""
 
 # Fixes include path.
 from super_mox import mox, SuperMoxTestBase
 
@@ skipping 15 matching lines @@
     gcl.REPOSITORY_ROOT = None
 
 
 class GclUnittest(GclTestsBase):
   """General gcl.py tests."""
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
         'CODEREVIEW_SETTINGS', 'CODEREVIEW_SETTINGS_FILE', 'Change',
         'ChangeInfo', 'Changes', 'Commit', 'DEFAULT_LINT_IGNORE_REGEX',
-        'DEFAULT_LINT_REGEX', 'DeleteEmptyChangeLists', 'DoPresubmitChecks',
-        'ErrorExit', 'FILES_CACHE', 'FilterFlag', 'GenerateChangeName',
-        'GenerateDiff', 'GetCLs', 'GetCacheDir', 'GetCachedFile',
-        'GetChangelistInfoFile', 'GetChangesDir', 'GetCodeReviewSetting',
-        'GetEditor', 'GetFilesNotInCL', 'GetInfoDir', 'GetIssueDescription',
-        'GetModifiedFiles', 'GetRepositoryRoot', 'Help', 'Lint',
-        'LoadChangelistInfoForMultiple', 'MISSING_TEST_MSG', 'Opened',
+        'DEFAULT_LINT_REGEX', 'CheckHomeForFile', 'DeleteEmptyChangeLists',
+        'DoPresubmitChecks', 'ErrorExit', 'FILES_CACHE', 'FilterFlag',
+        'GenerateChangeName', 'GenerateDiff', 'GetCLs', 'GetCacheDir',
+        'GetCachedFile', 'GetChangelistInfoFile', 'GetChangesDir',
+        'GetCodeReviewSetting', 'GetEditor', 'GetFilesNotInCL', 'GetInfoDir',
+        'GetIssueDescription', 'GetModifiedFiles', 'GetRepositoryRoot', 'Help',
+        'Lint', 'LoadChangelistInfoForMultiple', 'MISSING_TEST_MSG', 'Opened',
         'OptionallyDoPresubmitChecks', 'PresubmitCL', 'REPOSITORY_ROOT',
         'RunShell', 'RunShellWithReturnCode', 'SVN',
         'SendToRietveld', 'TryChange', 'UnknownFiles', 'UploadCL', 'Warn',
         'breakpad', 'gclient_utils', 'getpass', 'main', 'os', 'random', 're',
         'shutil', 'string', 'subprocess', 'sys', 'tempfile', 'upload',
         'urllib2',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(gcl, members)
 
   def testIsSVNMoved(self):
     # TODO(maruel): TEST ME
     pass
 
   def testGetSVNFileProperty(self):
     # TODO(maruel): TEST ME
     pass
 
   def testUnknownFiles(self):
     # TODO(maruel): TEST ME
     pass
 
+  def testCheckHomeForFile(self):
+    # TODO(maruel): TEST ME
+    pass
+
   def testGetRepositoryRootNone(self):
     gcl.os.getcwd().AndReturn(self.fake_root_dir)
     gcl.SVN.GetCheckoutRoot(self.fake_root_dir).AndReturn(None)
     self.mox.ReplayAll()
     self.assertRaises(gcl.gclient_utils.Error, gcl.GetRepositoryRoot)
 
   def testGetRepositoryRootGood(self):
     root_path = gcl.os.path.join('bleh', 'prout', 'pouet')
     gcl.os.getcwd().AndReturn(root_path)
     gcl.SVN.GetCheckoutRoot(root_path).AndReturn(root_path + '.~')
@@ skipping 147 matching lines @@
     self.mox.ReplayAll()
 
     change_info = gcl.ChangeInfo('', 0, 0, '', None, self.fake_root_dir,
                                  needs_upload=True)
     change_info.Save()
 
 
 class UploadCLUnittest(GclTestsBase):
   def setUp(self):
     GclTestsBase.setUp(self)
+    self.mox.StubOutWithMock(gcl, 'CheckHomeForFile')
     self.mox.StubOutWithMock(gcl, 'DoPresubmitChecks')
     self.mox.StubOutWithMock(gcl, 'GenerateDiff')
     self.mox.StubOutWithMock(gcl, 'GetCodeReviewSetting')
     self.mox.StubOutWithMock(gcl, 'GetRepositoryRoot')
     self.mox.StubOutWithMock(gcl, 'SendToRietveld')
     self.mox.StubOutWithMock(gcl, 'TryChange')
 
   def testNew(self):
     change_info = self.mox.CreateMock(gcl.ChangeInfo)
     change_info.name = 'naame'
     change_info.issue = 1
     change_info.patchset = 0
     change_info.description = 'deescription',
     change_info.files = [('A', 'aa'), ('M', 'bb')]
     change_info.patch = None
     files = [item[1] for item in change_info.files]
     args = ['--foo=bar']
+    gcl.CheckHomeForFile('.gcl_upload_no_try').AndReturn(None)
     gcl.DoPresubmitChecks(change_info, False, True).AndReturn(True)
     gcl.GetCodeReviewSetting('CODE_REVIEW_SERVER').AndReturn('my_server')
     gcl.os.getcwd().AndReturn('somewhere')
     change_info.GetFiles().AndReturn(change_info.files)
     change_info.GetLocalRoot().AndReturn('proout')
     gcl.os.chdir('proout')
     change_info.GetFileNames().AndReturn(files)
     gcl.GenerateDiff(files)
     gcl.upload.RealMain(['upload.py', '-y', '--server=my_server', '--foo=bar',
         "--message=''", '--issue=1'], change_info.patch).AndReturn(("1",
                                                                     "2"))
     gcl.SendToRietveld("/lint/issue%s_%s" % ('1', '2'), timeout=0.5)
     gcl.GetCodeReviewSetting('TRY_ON_UPLOAD').AndReturn('True')
     gcl.TryChange(change_info, [], swallow_exception=True)
     gcl.os.chdir('somewhere')
     change_info.Save()
     self.mox.ReplayAll()
 
     gcl.UploadCL(change_info, args)
 
   def testServerOverride(self):
     change_info = gcl.ChangeInfo('naame', 0, 0, 'deescription',
                                  [('A', 'aa'), ('M', 'bb')],
                                 self.fake_root_dir)
     self.mox.StubOutWithMock(change_info, 'Save')
     args = ['--server=a', '--no_watchlists']
     change_info.Save()
+    gcl.CheckHomeForFile('.gcl_upload_no_try').AndReturn(None)
     gcl.DoPresubmitChecks(change_info, False, True).AndReturn(True)
     gcl.GetCodeReviewSetting('CODE_REVIEW_SERVER').AndReturn('my_server')
     gcl.tempfile.mkstemp(text=True).AndReturn((42, 'descfile'))
     gcl.os.write(42, change_info.description)
     gcl.os.close(42)
     gcl.GetCodeReviewSetting('CC_LIST')
     gcl.GetCodeReviewSetting('PRIVATE')
     gcl.os.getcwd().AndReturn('somewhere')
     gcl.os.chdir(change_info.GetLocalRoot())
     gcl.GenerateDiff(change_info.GetFileNames())
@@ skipping 34 matching lines @@
 
     gcl.UploadCL(change_info, args)
 
   def testNormal(self):
     change_info = gcl.ChangeInfo('naame', 0, 0, 'deescription',
                                  [('A', 'aa'), ('M', 'bb')],
                                  self.fake_root_dir)
     self.mox.StubOutWithMock(change_info, 'Save')
     args = ['--no_watchlists']
     change_info.Save()
+    gcl.CheckHomeForFile('.gcl_upload_no_try').AndReturn(None)
     gcl.DoPresubmitChecks(change_info, False, True).AndReturn(True)
     gcl.GetCodeReviewSetting('CODE_REVIEW_SERVER').AndReturn('my_server')
     gcl.tempfile.mkstemp(text=True).AndReturn((42, 'descfile'))
     gcl.os.write(42, change_info.description)
     gcl.os.close(42)
     gcl.GetCodeReviewSetting('CC_LIST')
     gcl.GetCodeReviewSetting('PRIVATE')
     gcl.os.getcwd().AndReturn('somewhere')
     gcl.os.chdir(change_info.GetLocalRoot())
     gcl.GenerateDiff(change_info.GetFileNames())
     gcl.upload.RealMain(['upload.py', '-y', '--server=my_server',
         "--description_file=descfile",
         "--message=deescription"], change_info.patch).AndReturn(("1", "2"))
     gcl.os.remove('descfile')
     gcl.SendToRietveld("/lint/issue%s_%s" % ('1', '2'), timeout=0.5)
     gcl.GetCodeReviewSetting('TRY_ON_UPLOAD').AndReturn('True')
     gcl.TryChange(change_info, [], swallow_exception=True)
     gcl.os.chdir('somewhere')
     self.mox.ReplayAll()
 
     gcl.UploadCL(change_info, args)
     self.assertEquals(change_info.issue, 1)
     self.assertEquals(change_info.patchset, 2)
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()