Always add verbose logging for trybot command

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 logging
 import json
 import StringIO
 import unittest
 
 import mock
@@ skipping 303 matching lines @@
     command = trybot_command.Trybot()
     options = argparse.Namespace(trybot='android-nexus4', benchmark_name='foo')
     command.Run(options, [])
     self.assertEquals(
         ('Error creating branch telemetry-tryjob. '
          'Please delete it if it exists.\n'
          'fatal: A branch named \'telemetry-try\' already exists.\n'),
         self.log_output.getvalue())
 
   def _GetConfigForTrybot(self, name, platform, branch, cfg_filename,
-                          is_blink=False):
+                          is_blink=False, extra_benchmark_args=None):
     bot = '%s_perf_bisect' % name.replace('', '').replace('-', '_')
     self._MockTryserverJson({bot: 'stuff'})
     first_processes = ()
     if is_blink:
       first_processes = (
           (['git', 'rev-parse', '--abbrev-ref', 'HEAD'], (0, 'br', None)),
           (['git', 'update-index', '--refresh', '-q'], (0, None, None,)),
           (['git', 'diff-index', 'HEAD'], (0, '', None)),
           (['git', 'log', 'origin/master..HEAD'], (0, '', None))
       )
@@ skipping 13 matching lines @@
         (['git', 'cl', 'try', '-m', 'tryserver.chromium.perf', '-b', bot],
          (0, None, None)),
         (['git', 'checkout', branch], (0, None, None)),
         (['git', 'branch', '-D', 'telemetry-tryjob'], (0, None, None))
     ))
     cfg = StringIO.StringIO()
     self._stubs.open.files = {cfg_filename: cfg}
 
     options = argparse.Namespace(trybot=name, benchmark_name='sunspider')
     command = trybot_command.Trybot()
-    command.Run(options, [])
+    extra_benchmark_args = extra_benchmark_args or []
+    command.Run(options, extra_benchmark_args)
     return cfg.getvalue()
 
   def testConfigAndroid(self):
     config = self._GetConfigForTrybot(
         'android-nexus4', 'android', 'somebranch',
         'tools/run-perf-test.cfg')
     self.assertEquals(
         ('config = {\n'
          '  "command": "./tools/perf/run_benchmark '
-         '--browser=android-chromium sunspider",\n'
+         '--browser=android-chromium sunspider --verbose",\n'
          '  "max_time_minutes": "120",\n'
          '  "repeat_count": "1",\n'
          '  "target_arch": "ia32",\n'
          '  "truncate_percent": "0"\n'
          '}'), config)
 
   def testConfigMac(self):
     config = self._GetConfigForTrybot(
         'mac-10-9', 'mac', 'currentwork', 'tools/run-perf-test.cfg')
     self.assertEquals(
         ('config = {\n'
          '  "command": "./tools/perf/run_benchmark '
-         '--browser=release sunspider",\n'
+         '--browser=release sunspider --verbose",\n'
          '  "max_time_minutes": "120",\n'
          '  "repeat_count": "1",\n'
          '  "target_arch": "ia32",\n'
          '  "truncate_percent": "0"\n'
          '}'), config)
 
   def testConfigWinX64(self):
     config = self._GetConfigForTrybot(
         'win-x64', 'win-x64', 'currentwork', 'tools/run-perf-test.cfg')
     self.assertEquals(
         ('config = {\n'
          '  "command": "python tools\\\\perf\\\\run_benchmark '
-         '--browser=release_x64 sunspider",\n'
+         '--browser=release_x64 sunspider --verbose",\n'
          '  "max_time_minutes": "120",\n'
          '  "repeat_count": "1",\n'
          '  "target_arch": "x64",\n'
+         '  "truncate_percent": "0"\n'
+         '}'), config)
+
+  def testVerboseOptionIsNotAddedTwice(self):
+    config = self._GetConfigForTrybot(
+        'win-x64', 'win-x64', 'currentwork', 'tools/run-perf-test.cfg',
+        extra_benchmark_args=['-v'])
+    self.assertEquals(
+        ('config = {\n'
+         '  "command": "python tools\\\\perf\\\\run_benchmark '
+         '--browser=release_x64 sunspider -v",\n'
+         '  "max_time_minutes": "120",\n'
+         '  "repeat_count": "1",\n'
+         '  "target_arch": "x64",\n'
          '  "truncate_percent": "0"\n'
          '}'), config)
 
   def testConfigWinX64WithNoHyphen(self):
     config = self._GetConfigForTrybot(
         'winx64nvidia', 'win-x64', 'currentwork', 'tools/run-perf-test.cfg')
     self.assertEquals(
         ('config = {\n'
          '  "command": "python tools\\\\perf\\\\run_benchmark '
-         '--browser=release_x64 sunspider",\n'
+         '--browser=release_x64 sunspider --verbose",\n'
          '  "max_time_minutes": "120",\n'
          '  "repeat_count": "1",\n'
          '  "target_arch": "x64",\n'
          '  "truncate_percent": "0"\n'
          '}'), config)
 
   def testUnsupportedTrybot(self):
     self.assertRaises(
         trybot_command.TrybotError,
         trybot_command._GetBuilderNames,
         'arms-nvidia',
         {'win_perf_bisect': 'stuff'}
     )
 
   def testConfigBlink(self):
     config = self._GetConfigForTrybot(
         'mac-10-9', 'mac', 'blinkbranch',
         'Tools/run-perf-test.cfg', True)
     self.assertEquals(
         ('config = {\n'
          '  "command": "./tools/perf/run_benchmark '
-         '--browser=release sunspider",\n'
+         '--browser=release sunspider --verbose",\n'
          '  "max_time_minutes": "120",\n'
          '  "repeat_count": "1",\n'
          '  "target_arch": "ia32",\n'
          '  "truncate_percent": "0"\n'
          '}'), config)
 
   def testUpdateConfigGitCommitTrybotError(self):
     self._MockTryserverJson({'android_nexus4_perf_bisect': 'stuff'})
     command = trybot_command.Trybot()
     command._InitializeBuilderNames('android-nexus4')
@@ skipping 49 matching lines @@
     self.assertRaises(
         trybot_command.TrybotError, command._UpdateConfigAndRunTryjob,
         'android', cfg_filename, [])
 
   def testUpdateConfigSkipTryjob(self):
     self._MockTryserverJson({'win_perf_bisect': 'stuff'})
     command = trybot_command.Trybot()
     command._InitializeBuilderNames('win-x64')
     self._ExpectProcesses(())
     cfg_filename = 'tools/run-perf-test.cfg'
-    cfg_data = '''config = {
-  "command": "python tools\\\\perf\\\\run_benchmark --browser=release_x64",
+    cfg_data = ('''config = {
+  "command": "python tools\\\\perf\\\\run_benchmark --browser=release_x64'''
+''' --verbose",
   "max_time_minutes": "120",
   "repeat_count": "1",
   "target_arch": "x64",
   "truncate_percent": "0"
-}'''
+}''')
     self._stubs.open.files = {cfg_filename: cfg_data}
     self.assertEquals((trybot_command.NO_CHANGES, ''),
                       command._UpdateConfigAndRunTryjob(
                           'win-x64', cfg_filename, []))
 
   def testUpdateConfigGitTry(self):
     self._MockTryserverJson({'android_nexus4_perf_bisect': 'stuff'})
     command = trybot_command.Trybot()
     command._InitializeBuilderNames('android-nexus4')
     self._ExpectProcesses((
         (['git', 'commit', '-a', '-m', 'bisect config: android'],
          (0, 'None', None)),
         (['git', 'cl', 'upload', '-f', '--bypass-hooks', '-m',
           'CL for perf tryjob on android'],
          (0, 'stuff https://codereview.chromium.org/12345 stuff', None)),
         (['git', 'cl', 'try', '-m', 'tryserver.chromium.perf', '-b',
           'android_nexus4_perf_bisect'], (0, None, None))))
     cfg_filename = 'tools/run-perf-test.cfg'
     cfg = StringIO.StringIO()
     self._stubs.open.files = {cfg_filename: cfg}
     self.assertEquals((0, 'https://codereview.chromium.org/12345'),
                       command._UpdateConfigAndRunTryjob(
                           'android', cfg_filename, []))
     cfg.seek(0)
     config = '''config = {
-  "command": "./tools/perf/run_benchmark --browser=android-chromium",
+  "command": "./tools/perf/run_benchmark --browser=android-chromium --verbose",
   "max_time_minutes": "120",
   "repeat_count": "1",
   "target_arch": "ia32",
   "truncate_percent": "0"
 }'''
     self.assertEquals(cfg.read(), config)
 
   def testUpdateConfigGitTryAll(self):
     self._MockTryserverJson({
         'android_nexus4_perf_bisect': 'stuff',
@@ skipping 36 matching lines @@
     cfg_filename = 'tools/run-perf-test.cfg'
     cfg = StringIO.StringIO()
     self._stubs.open.files = {cfg_filename: cfg}
     self.assertEquals(0, command._AttemptTryjob(cfg_filename, []))
     cfg.seek(0)
 
     # The config contains both config for browser release & android-chromium,
     # but that's because the stub testing does not reset the StringIO. In
     # reality, the cfg_filename should be overwritten with the new data.
     config = ('''config = {
-  "command": "python tools\\\\perf\\\\run_benchmark --browser=release",
+  "command": "python tools\\\\perf\\\\run_benchmark --browser=release '''
+  '''--verbose",
   "max_time_minutes": "120",
   "repeat_count": "1",
   "target_arch": "ia32",
   "truncate_percent": "0"
 }''''''config = {
-  "command": "./tools/perf/run_benchmark --browser=android-chromium",
+  "command": "./tools/perf/run_benchmark --browser=android-chromium --verbose",
   "max_time_minutes": "120",
   "repeat_count": "1",
   "target_arch": "ia32",
   "truncate_percent": "0"
 }''')
     self.assertEquals(cfg.read(), config)