Remove CL upload logic from Perf Try Job workflow.

tools/perf/core/trybot_command_unittest.py

 # Copyright 2015 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 argparse
 import json
 import logging
 import os
 import StringIO
 import sys
 import unittest
@@ skipping 424 matching lines @@
         }, config)
 
   def testUnsupportedTrybot(self):
     self.assertRaises(
         trybot_command.TrybotError,
         trybot_command._GetBuilderNames,
         'arms-nvidia',
         {'win_perf_bisect': 'stuff'}
     )
 
-  def testUploadPatchToRietveldGitCommandFailed(self):
-    command, options = self._SetupTrybotCommand({'linux_perf_bisect': 'stuff'},
-                                                'linux')
+
+  def testGetChangeListCommandError(self):
+    command, _ = self._SetupTrybotCommand(
+        {'linux_perf_bisect': 'stuff'}, 'linux')
     self._ExpectProcesses((
-        (['git', 'cl', 'upload', '-f', '--bypass-hooks', '-m',
-          ('CL for src perf tryjob to run sunspider benchmark on linux '
-           'platform(s)')],
-         (128, None, None)),
+        (['git', 'cl', 'issue'], (128, None, None)),
     ))
     self._AssertTryBotExceptions(
-        'Could not upload to rietveld for src',
-        command._UploadPatchToRietveld,
-        'src',
-        options
-    )
+        'Failed to run "git cl issue" command.',
+        command._GetChangeList)
 
-  def testUploadPatchToRietveldNoURLMatchFound(self):
-    command, options = self._SetupTrybotCommand({'linux_perf_bisect': 'stuff'},
-                                                'linux')
+  def testGetChangeListNoIssues(self):
+    command, _ = self._SetupTrybotCommand(
+        {'linux_perf_bisect': 'stuff'}, 'linux')
     self._ExpectProcesses((
-        (['git', 'cl', 'upload', '-f', '--bypass-hooks', '-m',
-          ('CL for src perf tryjob to run sunspider benchmark on linux '
-           'platform(s)')],
-         (0, 'stuff https://dummy.chromium.org/12345 stuff', None)),
+        (['git', 'cl', 'issue'], (0, 'Issue number: None (None)', None)),
     ))
     self._AssertTryBotExceptions(
-        'Could not upload CL to rietveld for src!',
-        command._UploadPatchToRietveld,
-        'src',
-        options
-    )
+        ('PLEASE NOTE: The workflow for Perf Try jobs is changed. '
+         'In order to run the perf try job, you must first upload your '
+         'changes to rietveld.'),
+        command._GetChangeList)
 
-  def testUploadPatchToRietveldOnSuccess(self):
-    command, options = self._SetupTrybotCommand({'linux_perf_bisect': 'stuff'},
-                                                'linux')
+  def testGetChangeListWithIssue(self):
+    command, _ = self._SetupTrybotCommand(
+        {'linux_perf_bisect': 'stuff'}, 'linux')
     self._ExpectProcesses((
-        (['git', 'cl', 'upload', '-f', '--bypass-hooks', '-m',
-          ('CL for src perf tryjob to run sunspider benchmark on linux '
-           'platform(s)')],
+        (['git', 'cl', 'issue'],
          (0, 'stuff https://codereview.chromium.org/12345 stuff', None)),
     ))
-    self.assertEquals(command._UploadPatchToRietveld('src', options),
-                      'https://codereview.chromium.org/12345')
+    self.assertEquals('https://codereview.chromium.org/12345',
+                      command._GetChangeList())
 
   def testRunTryJobFailed(self):
     test_args = self._ExpectedGitTryTestArgs('sunspider', 'release')
     command, options = self._SetupTrybotCommand(
         {'linux_perf_bisect': 'stuff'}, 'linux', repo_path='path_to_repo/src')
     arguments = [options.benchmark_name] + []
     self._ExpectProcesses((
         (['git', 'cl', 'try', '-m', 'tryserver.chromium.perf',
           '-p', test_args,
           '-b',
@@ skipping 116 matching lines @@
   def testAttemptTryjobForCrRepo(self):
     test_args = self._ExpectedGitTryTestArgs('sunspider', 'release')
     command, options = self._SetupTrybotCommand({'linux_perf_bisect': 'stuff'},
                                                 'linux')
     self._ExpectProcesses((
         (['git', 'rev-parse', '--abbrev-ref', '--show-toplevel', 'HEAD'],
          (0, '/root/path_to/repo/src\nbr\n', None)),
         (['git', 'update-index', '--refresh', '-q'], (0, '', None,)),
         (['git', 'diff-index', 'HEAD'], (0, '', None)),
         (['git', 'footers', 'HEAD'], (0, '', None)),
-        (['git', 'cl', 'upload', '-f', '--bypass-hooks', '-m',
-          ('CL for src perf tryjob to run sunspider benchmark on linux '
-           'platform(s)')],
+        (['git', 'cl', 'issue'],
          (0, 'stuff https://codereview.chromium.org/12345 stuff', None)),
         (['git', 'cl', 'try', '-m', 'tryserver.chromium.perf',
           '-p', test_args, '-b', 'linux_perf_bisect'], (0, '', None))
     ))
     command._AttemptTryjob(options, [])
 
-    output = ('Uploaded try job to rietveld.\n'
+    output = ('Running try job....\n'
               'view progress here https://codereview.chromium.org/12345.\n'
               '\tRepo Name: src\n'
               '\tPath: %s\n'
               '\tBranch: br\n'
               'Perf Try job sent to rietveld for linux platform.') % (
                   options.repo_path)
     self.assertEquals(output, sys.stdout.getvalue().strip())
 
   @mock.patch('core.trybot_command.os.chdir', mock.MagicMock())
   @mock.patch('core.trybot_command.os.path.exists',
@@ skipping 12 matching lines @@
          'win_perf_bisect': 'stuff',
          'winx64_perf_bisect': 'stuff',
          'android_perf_bisect': 'stuff',
          'mac_perf_bisect': 'stuff'}, 'all')
     self._ExpectProcesses((
         (['git', 'rev-parse', '--abbrev-ref', '--show-toplevel', 'HEAD'],
          (0, '/root/path_to/repo/src\nbr\n', None)),
         (['git', 'update-index', '--refresh', '-q'], (0, '', None,)),
         (['git', 'diff-index', 'HEAD'], (0, '', None)),
         (['git', 'footers', 'HEAD'], (0, '', None)),
-        (['git', 'cl', 'upload', '-f', '--bypass-hooks', '-m',
-          ('CL for src perf tryjob to run sunspider benchmark on all '
-           'platform(s)')],
+        (['git', 'cl', 'issue'],
          (0, 'stuff https://codereview.chromium.org/12345 stuff', None)),
         (['git', 'cl', 'try', '-m', 'tryserver.chromium.perf',
           '-p', default_config, '-b', 'win_perf_bisect'], (0, '', None)),
         (['git', 'cl', 'try', '-m', 'tryserver.chromium.perf',
           '-p', android_config, '-b', 'android_perf_bisect'], (0, '', None)),
         (['git', 'cl', 'try', '-m', 'tryserver.chromium.perf',
           '-p', winx64_config, '-b', 'winx64_perf_bisect'], (0, '', None)),
         (['git', 'cl', 'try', '-m', 'tryserver.chromium.perf',
           '-p', default_config, '-b', 'mac_perf_bisect'], (0, '', None)),
         (['git', 'cl', 'try', '-m', 'tryserver.chromium.perf',
           '-p', default_config, '-b', 'linux_perf_bisect'], (0, '', None)),
     ))
     command._AttemptTryjob(options, [])
-    output = ('Uploaded try job to rietveld.\n'
+    output = ('Running try job....\n'
               'view progress here https://codereview.chromium.org/12345.\n'
               '\tRepo Name: src\n'
               '\tPath: %s\n'
               '\tBranch: br\n'
               'Perf Try job sent to rietveld for win platform.\n'
               'Perf Try job sent to rietveld for android platform.\n'
               'Perf Try job sent to rietveld for win-x64 platform.\n'
               'Perf Try job sent to rietveld for mac platform.\n'
               'Perf Try job sent to rietveld for linux platform.') % (
                   options.repo_path)
@@ skipping 16 matching lines @@
         (['git', 'update-index', '--refresh', '-q'], (0, '', None,)),
         (['git', 'diff-index', 'HEAD'], (0, '', None)),
         (['git', 'footers', 'HEAD'], (0, '', None)),
         (['git', 'config', 'branch.br.remote'], (0, '.', None)),
         (['git', 'rev-parse', '--abbrev-ref', 'br@{upstream}'],
          (0, 'br1', None,)),
         (['git', 'config', 'branch.br1.remote'], (0, 'origin', None)),
         (['git', 'config', 'remote.origin.url'],
          (0, 'https://chromium.googlesource.com/v8/v8.git', None)),
         (['git', 'rev-parse', 'br1@{upstream}'], (0, 'feedbeed', None)),
-        (['git', 'cl', 'upload', '-f', '--bypass-hooks', '-m',
-          ('CL for v8 perf tryjob to run sunspider benchmark on linux '
-           'platform(s)')],
+        (['git', 'cl', 'issue'],
          (0, 'stuff https://codereview.chromium.org/12345 stuff', None)),
         (['git', 'cl', 'try', '-m', 'tryserver.chromium.perf',
           '-p', test_args, '-p', deps_override_arg,
           '-b', 'linux_perf_bisect'], (0, '', None))
     ))
     command._AttemptTryjob(options, [])
 
-    output = ('Uploaded try job to rietveld.\n'
+    output = ('Running try job....\n'
               'view progress here https://codereview.chromium.org/12345.\n'
               '\tRepo Name: v8\n'
               '\tPath: root/path_to/repo/v8\n'
               '\tBranch: br\n'
               'Perf Try job sent to rietveld for linux platform.')
     self.assertEquals(output, sys.stdout.getvalue().strip())
 
   @mock.patch('core.trybot_command.os.chdir', mock.MagicMock())
   @mock.patch('core.trybot_command.os.path.exists',
               mock.MagicMock(return_value='True'))
@@ skipping 19 matching lines @@
         (['git', 'diff-index', 'HEAD'], (0, '', None)),
         (['git', 'footers', 'HEAD'], (0, '', None)),
         (['git', 'config', 'branch.br.remote'], (0, '.', None)),
         (['git', 'rev-parse', '--abbrev-ref', 'br@{upstream}'],
          (0, 'br1', None,)),
         (['git', 'config', 'branch.br1.remote'], (0, 'origin', None)),
         (['git', 'config', 'remote.origin.url'],
          (0, 'https://chromium.googlesource.com/v8/v8.git', None)),
         (['git', 'rev-parse', 'br1@{upstream}'],
          (0, 'feedbeed', None)),
-        (['git', 'cl', 'upload', '-f', '--bypass-hooks', '-m',
-          ('CL for v8 perf tryjob to run sunspider benchmark on all '
-           'platform(s)')],
+        (['git', 'cl', 'issue'],
          (0, 'stuff https://codereview.chromium.org/12345 stuff', None)),
         (['git', 'cl', 'try', '-m', 'tryserver.chromium.perf',
           '-p', android_config, '-p', deps_override_arg,
           '-b', 'android_perf_bisect'], (0, '', None)),
         (['git', 'cl', 'try', '-m', 'tryserver.chromium.perf',
           '-p', winx64_config, '-p', deps_override_arg,
           '-b', 'winx64_perf_bisect'], (0, '', None)),
         (['git', 'cl', 'try', '-m', 'tryserver.chromium.perf',
           '-p', default_config, '-p', deps_override_arg,
           '-b', 'linux_perf_bisect'], (0, '', None)),
     ))
     command._AttemptTryjob(options, [])
-    output = ('Uploaded try job to rietveld.\n'
+    output = ('Running try job....\n'
               'view progress here https://codereview.chromium.org/12345.\n'
               '\tRepo Name: v8\n'
               '\tPath: root/path_to/repo/v8\n'
               '\tBranch: br\n'
               'Perf Try job sent to rietveld for android platform.\n'
               'Perf Try job sent to rietveld for win-x64 platform.\n'
               'Perf Try job sent to rietveld for linux platform.')
     self.assertEquals(output, sys.stdout.getvalue().strip())
 
   @mock.patch('core.trybot_command.os.chdir', mock.MagicMock())
   @mock.patch('core.trybot_command.os.path.exists',
               mock.MagicMock(return_value='True'))
   @mock.patch('core.trybot_command.os.path.abspath',
               mock.MagicMock(return_value='root/path_to/repo/v8'))
   def testAttemptTryjobWithDepsRevisionArg(self):
     test_args = self._ExpectedGitTryTestArgs('sunspider', 'release')
     deps_override_arg = 'deps_revision_overrides={"src/v8": "feedbeed"}'
     command, options = self._SetupTrybotCommand(
         {'linux_perf_bisect': 'stuff'}, 'linux',
         repo_path='root/path_to/repo/v8', deps_revision='feedbeed')
     self._ExpectProcesses((
         (['git', 'rev-parse', '--abbrev-ref', '--show-toplevel', 'HEAD'],
          (0, 'root/path_to/repo/v8\nbr\n', None)),
         (['git', 'update-index', '--refresh', '-q'], (0, '', None,)),
         (['git', 'diff-index', 'HEAD'], (0, '', None)),
         (['git', 'footers', 'HEAD'], (0, '', None)),
-        (['git', 'cl', 'upload', '-f', '--bypass-hooks', '-m',
-          ('CL for v8 perf tryjob to run sunspider benchmark on linux '
-           'platform(s)')],
+        (['git', 'cl', 'issue'],
          (0, 'stuff https://codereview.chromium.org/12345 stuff', None)),
         (['git', 'cl', 'try', '-m', 'tryserver.chromium.perf',
           '-p', test_args, '-p', deps_override_arg,
           '-b', 'linux_perf_bisect'], (0, '', None))
     ))
     command._AttemptTryjob(options, [])
 
-    output = ('Uploaded try job to rietveld.\n'
+    output = ('Running try job....\n'
               'view progress here https://codereview.chromium.org/12345.\n'
               '\tRepo Name: v8\n'
               '\tPath: root/path_to/repo/v8\n'
               '\tBranch: br\n'
               'Perf Try job sent to rietveld for linux platform.')
     self.assertEquals(output, sys.stdout.getvalue().strip())
 
 
 class IsBenchmarkDisabledOnTrybotPlatformTest(unittest.TestCase):
 
@@ skipping 36 matching lines @@
     @benchmark.Enabled('win', 'mac')
     class FooBenchmark(benchmark.Benchmark):
       pass
     self.assertFalse(self.IsBenchmarkDisabled(FooBenchmark, 'all'))
     self.assertFalse(self.IsBenchmarkDisabled(FooBenchmark, 'all-mac'))
     self.assertFalse(self.IsBenchmarkDisabled(FooBenchmark, 'winx64ati'))
 
     self.assertTrue(self.IsBenchmarkDisabled(FooBenchmark, 'android-s5'))
     self.assertTrue(self.IsBenchmarkDisabled(FooBenchmark, 'linux'))
     self.assertTrue(self.IsBenchmarkDisabled(FooBenchmark, 'all-linux'))