Fix AutoRoll after Git transition

scripts/tools/blink_roller/auto_roll_test.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 
 import datetime
 import unittest
 
 import auto_roll
@@ skipping 97 matching lines @@
       return self._contents
 
   def setUp(self):
     SuperMoxTestBase.setUp(self)
     self.mox.StubOutWithMock(auto_roll.rietveld.Rietveld, 'add_comment')
     self.mox.StubOutWithMock(auto_roll.rietveld.Rietveld, 'close_issue')
     self.mox.StubOutWithMock(auto_roll.rietveld.Rietveld,
                              'get_issue_properties')
     self.mox.StubOutWithMock(auto_roll.rietveld.Rietveld, 'search')
     self.mox.StubOutWithMock(auto_roll.scm.GIT, 'Capture')
+    self.mox.StubOutWithMock(auto_roll.subprocess2, 'call')
     self.mox.StubOutWithMock(auto_roll.subprocess2, 'check_call')
     self.mox.StubOutWithMock(auto_roll.subprocess2, 'check_output')
     self.mox.StubOutWithMock(auto_roll.urllib2, 'urlopen')
     auto_roll.datetime.datetime = self.MockDateTime
     auto_roll.rietveld.upload.HttpRpcServer = self.MockHttpRpcServer
     self._arb = auto_roll.AutoRoller(self.TEST_PROJECT,
                                      self.TEST_AUTHOR,
                                      self.PATH_TO_CHROME)
 
   def _make_issue(self, old_rev=None, new_rev=None, created_datetime=None):
@@ skipping 24 matching lines @@
     else:
       auto_roll.subprocess2.check_output(
           ['git', '--git-dir', './third_party/test_project/.git', 'show', '-s',
            'origin/master']).AndReturn(self.GIT_LOG_UPDATED)
 
   def _upload_issue(self, custom_message=None):
     self._get_last_revision()
     self._get_current_revision()
     self._compare_revs(self.OLD_REV, self.NEW_REV)
 
+    auto_roll.subprocess2.check_call(['git', 'clean', '-d', '-f'])
+    auto_roll.subprocess2.call(['git', 'rebase', '--abort'])
+    auto_roll.subprocess2.call(['git', 'branch', '-D', 'test_project_roll'])
+    auto_roll.subprocess2.check_call(['git', 'checkout', 'master', '-f'])
+    auto_roll.subprocess2.check_call(['git', 'checkout',
+                                      '-b', 'test_project_roll',
+                                      '-t', 'origin/master', '-f'])
+
     from_rev = self._display_rev(self.OLD_REV)
     to_rev = self._display_rev(self.NEW_REV)
+    message = custom_message or 'Test_Project roll %s:%s' % (from_rev, to_rev)
+    message += '\nTBR='
+    auto_roll.subprocess2.check_call(
+        ['roll-dep', 'third_party/%s' % self.TEST_PROJECT, str(self.NEW_REV)])
 
-    message = custom_message or 'Test_Project roll %s:%s' % (from_rev, to_rev)
+    auto_roll.subprocess2.check_call(['git', 'add', 'DEPS'])
+    auto_roll.subprocess2.check_call(['git', 'commit', '-m', message])
+    auto_roll.subprocess2.check_call(['git', 'cl', 'upload', '--bypass-hooks',
+                                      '--use-commit-queue'])
+    auto_roll.subprocess2.check_call(['git', 'checkout', 'master', '-f'])
+    auto_roll.subprocess2.check_call(['git', 'branch', '-D',
+                                      'test_project_roll'])
 
-    auto_roll.subprocess2.check_call(
-        ['./tools/safely-roll-deps.py', self.TEST_PROJECT, str(self.NEW_REV),
-         '--message', message, '--force'])
     issue = self._make_issue(created_datetime=self.CURRENT_DATETIME_STR)
     self._arb._rietveld.search(owner=self.TEST_AUTHOR,
                                closed=2).AndReturn([issue])
     self._arb._rietveld.add_comment(issue['issue'],
                                     self._arb.ROLL_BOT_INSTRUCTIONS)
 
   def test_should_stop(self):
     if self.__class__.__name__ == 'AutoRollTestBase':
       return
     issue = self._make_issue(created_datetime=self.OLD_ISSUE_CREATED_STR)
@@ skipping 151 matching lines @@
 
 
 class AutoRollTestSVN(AutoRollTestBase):
 
   OLDER_REV = 1231
   OLD_REV = 1234
   NEW_REV = 1235
 
   DEPS_CONTENT = '''
 vars = {
-  "test_project_revision": "%d",
+  'test_project_revision': '%d',
 }
 ''' % OLD_REV
 
   _GIT_LOG = '''
 commit abcde
 Author: Test Author <test_author@example.com>
 Date:   Wed Apr 2 14:00:14 2014 -0400
 
     Make some changes.
 
@@ skipping 25 matching lines @@
 
 
 class AutoRollTestGit(AutoRollTestBase):
 
   OLDER_REV = 'cfcf604fbdcf6e2d9b982a2fab3fc9f1e3f8cd65'
   OLD_REV =   'b9af6489f6f2004ad11b82c6057f7007e3c35372'
   NEW_REV =   '79539998e04afab3ee9c3016881755ca52f60a73'
 
   DEPS_CONTENT = '''
 vars = {
-  "test_project_revision": "%s",
+  'test_project_revision': '%s',
 }
 ''' % OLD_REV
 
   _GIT_LOG = '''
 commit %s
 Author: Test Author <test_author@example.com>
 Date:   Wed Apr 2 14:00:14 2014 -0400
 
     Make some changes.
 '''
@@ skipping 41 matching lines @@
 
   # pylint: disable=R0201
   def _parse_origin_master(self, returnval):
     auto_roll.subprocess2.check_output(
         ['git', '--git-dir', './third_party/test_project/.git', 'rev-parse',
          'origin/master']).AndReturn(returnval)
 
 
 if __name__ == '__main__':
   unittest.main()