Changes gcl upload to not submit a try....

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 178 matching lines @@
 
   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]
-    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',
                          '-r', 'georges@example.com',
                          '--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()
     gcl.GetRepositoryRoot().AndReturn(self.fake_root_dir)
     gcl.ChangeInfo.Load('naame', self.fake_root_dir, True, True
         ).AndReturn(change_info)
     self.mox.ReplayAll()
 
     gcl.CMDupload(['naame', '-r', 'georges@example.com'])
 
   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')
     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', '--server=a',
         "--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.os.chdir('somewhere')
     gcl.GetRepositoryRoot().AndReturn(self.fake_root_dir)
     gcl.ChangeInfo.Load('naame', self.fake_root_dir, True, True
         ).AndReturn(change_info)
     self.mox.ReplayAll()
 
     gcl.CMDupload(['naame', '--server=a', '--no_watchlists'])
 
-  def testNoTry(self):
-    change_info = gcl.ChangeInfo('naame', 0, 0, 'deescription',
-                                 [('A', 'aa'), ('M', 'bb')],
-                                 self.fake_root_dir)
-    change_info.Save = self.mox.CreateMockAnything()
-    change_info.Save()
-    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.os.chdir('somewhere')
-    gcl.GetRepositoryRoot().AndReturn(self.fake_root_dir)
-    gcl.ChangeInfo.Load('naame', self.fake_root_dir, True, True
-        ).AndReturn(change_info)
-    self.mox.ReplayAll()
-
-    gcl.CMDupload(['naame', '--no-try', '--no_watchlists'])
-
   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')
     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')
     gcl.GetRepositoryRoot().AndReturn(self.fake_root_dir)
     gcl.ChangeInfo.Load('naame', self.fake_root_dir, True, True
         ).AndReturn(change_info)
     self.mox.ReplayAll()
 
     gcl.CMDupload(['naame', '--no_watchlists'])
     self.assertEquals(change_info.issue, 1)
     self.assertEquals(change_info.patchset, 2)
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()