Change for preparation for reference-build on perfbot (media)

chrome/test/functional/media/media_test_runner.py

 #!/usr/bin/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.
 
 """A module to execute a subclass of MediaTastBase class.
 
 This executes a media test class (a subclass of MediaTastBase class) with
 different configuration (parameters) which are passed in the form of
@@ skipping 94 matching lines @@
   parser.add_option(
       '-c', '--test_scenario', dest='test_scenario',
       default='', help='Test scenario (action triples delimited by \'|\')')
   parser.add_option('-s', '--suite', dest='suite',
                     help='Suite file')
   parser.add_option('-e', '--media_file', dest='media_file',
                     default='',
                     help=('Media file to be played using player.html. '
                           'The relative path needs to be specified starting '
                           'from data/html/ directory.'))
+  parser.add_option('-a', '--reference_build', dest='reference_build',
+                    help='Include reference build run', default=False)

[dennis_jeffrey, 2011/05/19 01:20:13]

add the following parameter:

action='store_true'

That way, it's clear that the default value for this option will be False, but
if this flag is specified, the value will change to True.

[imasaki1, 2011/05/20 05:12:01]

Done.

 
   options, args = parser.parse_args()
   if args:
     parser.print_help()
     sys.exit(1)
 
   test_data_list = []
   if options.media_file:
     test_data_list.append(['video', options.media_file, options.media_file])
   elif options.input_matrix_filename is None:
@@ skipping 11 matching lines @@
         True, options.video_matrix_home_url)
     if options.input_matrix_testcase_name is None:
       # Use all test cases.
       test_data_list = all_data_list
     else:
       # Choose particular video.
       media_info = MediaTestMatrix.LookForMediaInfoInCompactFormByNickName(
           all_data_list, options.input_matrix_testcase_name)
       if media_info is not None:
         test_data_list.append(media_info)
+
+  # Determine if we need to loop. The defsault is False

[dennis_jeffrey, 2011/05/19 01:20:13]

I recommend this comment, if it's accurate:

# Determine whether we need to repeat a test using a reference build.

[Nirnimesh, 2011/05/19 06:40:20]

typo: defsault

[imasaki1, 2011/05/20 05:12:01]

Done.

[imasaki1, 2011/05/20 05:12:01]

Done.

+  reference_build_list = [False]
+  # reference_build_list = [True]

[Nirnimesh, 2011/05/19 06:40:20]

remove commented code

[imasaki1, 2011/05/20 05:12:01]

Done.

+  if options.reference_build:
+    reference_build_list.append(True)

[dennis_jeffrey, 2011/05/19 01:20:13]

(optional) I recommend replacing lines 150-153 with this, since it might be a
little clearer.

if options.reference_build:
  reference_build_list = [False, True]
else:
  reference_build_list = [False]

[imasaki1, 2011/05/20 05:12:01]

Done.

   # This is a loop for iterating through all videos defined above (list
   # or matrix). Each video has associated tag and nickname for display
   # purpose.
   for tag, filename, nickname in test_data_list:
       # This inner loop iterates twice. The first iteration of the loop
       # disables the media cache, and the second iteration enables the media
       # cache.  Other parameters remain the same on both loop iterations.
       # There are two ways to disable the media cache: setting Chrome option
       # to --media-cache-size=1 or adding t parameter in query parameter of
       # URL in which player.js (data/media/html/player.js) disables the
       # media cache). We are doing both here. Please note the length of
       # CHROME_FLAGS and ADD_T_PARAMETERS should be the same.
       for j in range(len(CHROME_FLAGS)):
-        parent_envs = copy.deepcopy(os.environ)
-        if options.input_matrix_filename is None:
-          filename = os.path.join(os.pardir, filename)
-        envs = {
-          MediaTestEnvNames.MEDIA_TAG_ENV_NAME: tag,
-          MediaTestEnvNames.MEDIA_FILENAME_ENV_NAME: filename,
-          MediaTestEnvNames.MEDIA_FILENAME_NICKNAME_ENV_NAME: nickname,
-          MediaTestEnvNames.PLAYER_HTML_URL_ENV_NAME:
-            options.player_html_url,
-          MediaTestEnvNames.PLAYER_HTML_URL_NICKNAME_ENV_NAME:
-            options.player_html_url_nickname,
-          MediaTestEnvNames.EXTRA_NICKNAME_ENV_NAME:
-            EXTRA_NICKNAMES[j],
-          # Enables or disables the media cache.
-          # (refer to data/media/html/player.js)
-          MediaTestEnvNames.ADD_T_PARAMETER_ENV_NAME: ADD_T_PARAMETERS[j],
-          MediaTestEnvNames.PRINT_ONLY_TIME_ENV_NAME: PRINT_ONLY_TIME,
-          MediaTestEnvNames.N_RUNS_ENV_NAME: str(options.number_of_runs),
-          MediaTestEnvNames.REMOVE_FIRST_RESULT_ENV_NAME:
-            REMOVE_FIRST_RESULT,
-          MediaTestEnvNames.MEASURE_INTERVAL_ENV_NAME:
-            str(options.measure_intervals),
-          MediaTestEnvNames.TEST_SCENARIO_FILE_ENV_NAME:
-            options.test_scenario_input_filename,
-          MediaTestEnvNames.TEST_SCENARIO_ENV_NAME:
-            options.test_scenario,
-        }
-        envs.update(parent_envs)
-        if options.suite is None and options.test_prog_name is not None:
-          # Suite is not used - run test program directly.
-          test_prog_name = options.test_prog_name
-          suite_string = ''
-        else:
-          # Suite is used.
-          # The test script names are in the PYAUTO_TEST file.
-          test_prog_name = pyauto_functional_script_name
-          if options.suite is None:
-            suite_name = DEFAULT_SUITE_NAME
+        for reference_build in reference_build_list:
+          parent_envs = copy.deepcopy(os.environ)
+          if options.input_matrix_filename is None:
+            par_filename = os.path.join(os.pardir, filename)
+          envs = {
+            MediaTestEnvNames.MEDIA_TAG_ENV_NAME: tag,
+            MediaTestEnvNames.MEDIA_FILENAME_ENV_NAME: par_filename,
+            MediaTestEnvNames.MEDIA_FILENAME_NICKNAME_ENV_NAME: nickname,
+            MediaTestEnvNames.PLAYER_HTML_URL_ENV_NAME:
+              options.player_html_url,
+            MediaTestEnvNames.PLAYER_HTML_URL_NICKNAME_ENV_NAME:
+              options.player_html_url_nickname,
+            MediaTestEnvNames.EXTRA_NICKNAME_ENV_NAME:
+              EXTRA_NICKNAMES[j],
+            # Enables or disables the media cache.
+            # (refer to data/media/html/player.js)
+            MediaTestEnvNames.ADD_T_PARAMETER_ENV_NAME: ADD_T_PARAMETERS[j],
+            MediaTestEnvNames.PRINT_ONLY_TIME_ENV_NAME: PRINT_ONLY_TIME,
+            MediaTestEnvNames.N_RUNS_ENV_NAME: str(options.number_of_runs),
+            MediaTestEnvNames.REMOVE_FIRST_RESULT_ENV_NAME:
+              REMOVE_FIRST_RESULT,
+            MediaTestEnvNames.MEASURE_INTERVAL_ENV_NAME:
+              str(options.measure_intervals),
+            MediaTestEnvNames.TEST_SCENARIO_FILE_ENV_NAME:
+              options.test_scenario_input_filename,
+            MediaTestEnvNames.TEST_SCENARIO_ENV_NAME:
+              options.test_scenario,
+            MediaTestEnvNames.REFERENCE_BUILD_ENV_NAME:
+              str(reference_build),
+          }
+          envs.update(parent_envs)
+          if options.suite is None and options.test_prog_name is not None:
+            # Suite is not used - run test program directly.
+            test_prog_name = options.test_prog_name
+            suite_string = ''
           else:
-            suite_name = options.suite
-          suite_string = ' --suite=%s' % suite_name
-        test_prog_name = sys.executable + ' ' + test_prog_name
-        cmd = test_prog_name + suite_string + ' ' + CHROME_FLAGS[j]
-        proc = Popen(cmd, env=envs, shell=True)
-        proc.communicate()
+            # Suite is used.
+            # The test script names are in the PYAUTO_TEST file.
+            test_prog_name = pyauto_functional_script_name
+            if options.suite is None:
+              suite_name = DEFAULT_SUITE_NAME
+            else:
+              suite_name = options.suite
+            suite_string = ' --suite=%s' % suite_name
+          test_prog_name = sys.executable + ' ' + test_prog_name
+          cmd = test_prog_name + suite_string + ' ' + CHROME_FLAGS[j] + ' -v'
+          proc = Popen(cmd, env=envs, shell=True)
+          proc.communicate()
         if options.one_combination:
           sys.exit(0)
 
 
 if __name__ == '__main__':
   main()