Add UpgradeToHttps() to reliably and forcibly upgrade all urls to https

tests/gcl_unittest.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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."""
 
 # pylint: disable=E1103,E1101,E1120
 
 import os
@@ skipping 34 matching lines @@
     change_info.name = 'naame'
     change_info.issue = 1
     change_info.patchset = 0
     change_info.description = 'deescription'
     change_info.files = files
     change_info.GetFiles = lambda : change_info.files
     change_info.GetIssueDescription = lambda : change_info.description
     change_info.GetFileNames = lambda : [f[1] for f in change_info.files]
     change_info.GetLocalRoot = lambda : 'proout'
     change_info.patch = None
-    change_info.rietveld = 'my_server'
+    change_info.rietveld = 'https://my_server'
     change_info.reviewers = None
     change_info._closed = False
     change_info._deleted = False
 
     def Delete():
       change_info._deleted = True
     change_info.Delete = Delete
 
     def CloseIssue():
       change_info._closed = True
@@ skipping 186 matching lines @@
     self.assertEquals(change_info.name, 'bleh')
     self.assertEquals(change_info.issue, 0)
     self.assertEquals(change_info.patchset, 0)
     self.assertEquals(change_info.description, "")
     self.assertEquals(change_info.GetFiles(), [])
 
   def testSaveEmpty(self):
     gcl.GetChangelistInfoFile('').AndReturn('foo')
     values = {
         'description': '', 'patchset': 2, 'issue': 1,
-        'files': [], 'needs_upload': False, 'rietveld': 'foo'}
+        'files': [], 'needs_upload': False, 'rietveld': 'https://foo'}
     gcl.gclient_utils.FileWrite(
         'foo', gcl.json.dumps(values, sort_keys=True, indent=2))
     self.mox.ReplayAll()
 
     change_info = gcl.ChangeInfo(
         '', 1, 2, '', None, self.fake_root_dir, 'foo', False)
     change_info.Save()
 
   def testSaveDirty(self):
     gcl.GetChangelistInfoFile('n').AndReturn('foo')
     values = {
         'description': 'des', 'patchset': 0, 'issue': 0,
-        'files': [], 'needs_upload': True, 'rietveld': 'foo'}
+        'files': [], 'needs_upload': True, 'rietveld': 'https://foo'}
     gcl.gclient_utils.FileWrite(
         'foo', gcl.json.dumps(values, sort_keys=True, indent=2))
     self.mox.ReplayAll()
 
     change_info = gcl.ChangeInfo('n', 0, 0, 'des', None, self.fake_root_dir,
                                  'foo', needs_upload=True)
     change_info.Save()
 
 
 class CMDuploadUnittest(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.ChangeInfo, 'SendToRietveld')
     self.mox.StubOutWithMock(gcl, 'TryChange')
     self.mox.StubOutWithMock(gcl.ChangeInfo, 'Load')
 
   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\n\nR=foo@bar.com',
     change_info.files = [('A', 'aa'), ('M', 'bb')]
     change_info.patch = None
-    change_info.rietveld = 'my_server'
+    change_info.rietveld = 'https://my_server'
     files = [item[1] for item in change_info.files]
     output = presubmit_support.PresubmitOutput()
     gcl.DoPresubmitChecks(change_info, False, True).AndReturn(output)
     #gcl.GetCodeReviewSetting('CODE_REVIEW_SERVER').AndReturn('my_server')
     gcl.os.getcwd().AndReturn('somewhere')
     change_info.GetFiles().AndReturn(change_info.files)
     gcl.os.chdir('proout')
     change_info.GetFileNames().AndReturn(files)
     gcl.GenerateDiff(files)
-    gcl.upload.RealMain(['upload.py', '-y', '--server=my_server',
+    gcl.upload.RealMain(['upload.py', '-y', '--server=https://my_server',
                          '-r', 'georges@example.com',
                          '--message=\'\'', '--issue=1'],
                          change_info.patch).AndReturn(("1",
                                                                     "2"))
     change_info.GetLocalRoot().AndReturn('proout')
     change_info.Save()
     change_info.PrimeLint()
     gcl.os.chdir('somewhere')
     gcl.sys.stdout.write("*** Upload does not submit a try; use gcl try to"
                          " submit a try. ***")
@@ skipping 23 matching lines @@
     output = presubmit_support.PresubmitOutput()
     gcl.DoPresubmitChecks(change_info, False, True).AndReturn(output)
     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.upload.RealMain(
+        [ 'upload.py', '-y', '--server=https://my_server', '--server=a',
+          '--description_file=descfile', '--message=deescription'],
+        change_info.patch).AndReturn(("1", "2"))
     gcl.os.remove('descfile')
     change_info.SendToRietveld("/lint/issue%s_%s" % ('1', '2'), timeout=1)
     gcl.os.chdir('somewhere')
     gcl.sys.stdout.write("*** Upload does not submit a try; use gcl try to"
                          " submit a try. ***")
     gcl.sys.stdout.write("\n")
     gcl.GetRepositoryRoot().AndReturn(self.fake_root_dir)
     gcl.ChangeInfo.Load('naame', self.fake_root_dir, True, True
         ).AndReturn(change_info)
     self.mox.ReplayAll()
@@ skipping 18 matching lines @@
     output = presubmit_support.PresubmitOutput()
     gcl.DoPresubmitChecks(change_info, False, True).AndReturn(output)
     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',
+    gcl.upload.RealMain(['upload.py', '-y', '--server=https://my_server',
         "--description_file=descfile",
         "--message=deescription"], change_info.patch).AndReturn(("1", "2"))
     gcl.os.remove('descfile')
     change_info.SendToRietveld("/lint/issue%s_%s" % ('1', '2'), timeout=1)
     gcl.os.chdir('somewhere')
     gcl.sys.stdout.write("*** Upload does not submit a try; use gcl try to"
                          " submit a try. ***")
     gcl.sys.stdout.write("\n")
     gcl.GetRepositoryRoot().AndReturn(self.fake_root_dir)
     gcl.ChangeInfo.Load('naame', self.fake_root_dir, True, True
@@ skipping 24 matching lines @@
       pass
 
   def testReviewersInDescription(self):
     change_info = self.mox.CreateMock(gcl.ChangeInfo)
     change_info.name = 'naame'
     change_info.issue = 1
     change_info.patchset = 0
     change_info.description = 'deescription\n\nR=georges@example.com',
     change_info.files = [('A', 'aa'), ('M', 'bb')]
     change_info.patch = None
-    change_info.rietveld = 'my_server'
+    change_info.rietveld = 'https://my_server'
     change_info.reviewers = ['georges@example.com']
     files = [item[1] for item in change_info.files]
     output = presubmit_support.PresubmitOutput()
     gcl.DoPresubmitChecks(change_info, False, True).AndReturn(output)
     #gcl.GetCodeReviewSetting('CODE_REVIEW_SERVER').AndReturn('my_server')
     gcl.os.getcwd().AndReturn('somewhere')
     change_info.GetFiles().AndReturn(change_info.files)
     change_info.GetFileNames().AndReturn(files)
     change_info.GetLocalRoot().AndReturn('proout')
     gcl.os.chdir('proout')
     gcl.GenerateDiff(files)
-    gcl.upload.RealMain(['upload.py', '-y', '--server=my_server',
+    gcl.upload.RealMain(['upload.py', '-y', '--server=https://my_server',
                          '--reviewers=georges@example.com',
                          '--message=\'\'', '--issue=1'],
                          change_info.patch).AndReturn(("1", "2"))
     change_info.Save()
     change_info.PrimeLint()
     gcl.os.chdir('somewhere')
     gcl.sys.stdout.write("*** Upload does not submit a try; use gcl try to"
                          " submit a try. ***")
     gcl.sys.stdout.write("\n")
     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'])
     self.checkstdout('*** Upload does not submit a try; use gcl try to submit '
         'a try. ***\n'
         '*** Upload does not submit a try; use gcl try to submit a try. ***\n')
 
   def testSuggestReviewers(self):
     change_info = self.fakeChange()
     output = presubmit_support.PresubmitOutput()
     output.reviewers = ['foo@example.com', 'bar@example.com']
     gcl.DoPresubmitChecks(change_info, False, True).AndReturn(output)
     #gcl.GetCodeReviewSetting('CODE_REVIEW_SERVER').AndReturn('my_server')
     gcl.os.getcwd().AndReturn('somewhere')
     gcl.os.chdir('proout')
     gcl.GenerateDiff(change_info.GetFileNames())
-    gcl.upload.RealMain(['upload.py', '-y', '--server=my_server',
+    gcl.upload.RealMain(['upload.py', '-y', '--server=https://my_server',
                          '--reviewers=foo@example.com,bar@example.com',
                          '--message=\'\'', '--issue=1'],
                          change_info.patch).AndReturn(("1", "2"))
     change_info.Save()
     change_info.PrimeLint()
     gcl.os.chdir('somewhere')
     gcl.sys.stdout.write("*** Upload does not submit a try; use gcl try to"
                          " submit a try. ***")
     gcl.sys.stdout.write("\n")
     gcl.GetRepositoryRoot().AndReturn(self.fake_root_dir)
@@ skipping 54 matching lines @@
     self.mockPresubmit(change_info, fail=True)
     self.mox.ReplayAll()
 
     retval = gcl.CMDcommit(['naame'])
 
     self.assertEquals(retval, 1)
 
   def testPresubmitSucceeds(self):
     change_info = self.mockLoad()
     self.mockPresubmit(change_info, fail=False)
-    self.mockCommit(change_info, 'deescription\nReview URL: http://my_server/1',
-                    '')
+    self.mockCommit(
+        change_info, 'deescription\nReview URL: https://my_server/1', '')
     self.mox.ReplayAll()
 
     retval = gcl.CMDcommit(['naame'])
 
     self.assertEquals(retval, 0)
     self.assertEquals(change_info.description, 'deescription')
     # pylint: disable=W0212
     self.assertFalse(change_info._deleted)
     self.assertFalse(change_info._closed)
 
   def testPresubmitSucceedsWithCommittedMessage(self):
     change_info = self.mockLoad()
     self.mockPresubmit(change_info, fail=False)
-    self.mockCommit(change_info, 'deescription\nReview URL: http://my_server/1',
-                    '\nCommitted revision 12345')
+    self.mockCommit(
+        change_info, 'deescription\nReview URL: https://my_server/1',
+        '\nCommitted revision 12345')
 
     self.mox.ReplayAll()
 
     retval = gcl.CMDcommit(['naame'])
     self.assertEquals(retval, 0)
     self.assertEquals(change_info.description,
-        'deescription\n\nCommitted: http://view/12345')
+        'deescription\n\nCommitted: https://view/12345')
     # pylint: disable=W0212
     self.assertTrue(change_info._deleted)
     self.assertTrue(change_info._closed)
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()