Introduce AddMediaTests factory method.

scripts/master/factory/chromium_factory.py

 # 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.
 
 """Utility class to build the chromium master BuildFactory's.
 
 Based on gclient_factory.py and adds chromium-specific steps."""
 
 import os
 import re
@@ skipping 50 matching lines @@
   # triggered by a webkit poller.
   CUSTOM_VARS_WEBKIT_LATEST = [('webkit_trunk', config.Master.webkit_trunk_url),
                                ('webkit_revision', '$$WK_REV$$')]
   # safe sync urls
   SAFESYNC_URL_CHROMIUM = 'http://chromium-status.appspot.com/lkgr'
 
   # gclient additional custom deps
   CUSTOM_DEPS_V8_LATEST = ('src/v8',
     'http://v8.googlecode.com/svn/branches/bleeding_edge')
   CUSTOM_DEPS_AVPERF = ('src/chrome/test/data/media/avperf',
-    'http://src.chromium.org/svn/trunk/deps/avperf')  
+    'http://src.chromium.org/svn/trunk/deps/avperf')
   CUSTOM_DEPS_NACL_LATEST = [
     ('src/native_client',
      'http://src.chromium.org/native_client/trunk/src/native_client'),
     ('src/native_client/src/third_party/ppapi',
      'http://src.chromium.org/svn/trunk/src/ppapi'),
   ]
   CUSTOM_DEPS_VALGRIND = ('src/third_party/valgrind',
      config.Master.trunk_url + '/deps/third_party/valgrind/binaries')
   CUSTOM_DEPS_DEVTOOLS_PERF = [
     ('src/third_party/WebKit/PerformanceTests',
@@ skipping 50 matching lines @@
     'autodiscovery':
       [('src/data/autodiscovery', None)],
     'esctf':
       [('src/data/esctf', None)],
     'grit':
       [('src/tools/grit/grit/test/data', None)],
     'mozilla_js':
       [('src/data/mozilla_js_tests', None)],
   }
 
+  # List of test groups for media tests.  Media tests generate a lot of data, so
+  # it's nice to separate them into different graphs.  Each tuple corresponds to
+  # a PyAuto test suite name and indicates if the suite contains perf tests.
+  MEDIA_TEST_GROUPS = [
+      ('AV_PERF', True),
+  ]
+
   # Minimal deps for running PyAuto.
   # http://dev.chromium.org/developers/pyauto
   PYAUTO_DEPS = \
       [('src/chrome/test/data',
         'http://src.chromium.org/svn/trunk/src/chrome/test/data'),
        ('src/chrome/test/pyautolib',
         'http://src.chromium.org/svn/trunk/src/chrome/test/pyautolib'),
        ('src/chrome/test/functional',
         'http://src.chromium.org/svn/trunk/src/chrome/test/functional'),
        ('src/third_party/simplejson',
@@ skipping 246 matching lines @@
                  'linux2': 'lucid64bit' }
       zip_plat = platmap[self._target_platform]
       workdir = os.path.join(f.working_dir, 'chrome-' + zip_plat)
       f.AddPyAutoFunctionalTest('pyauto_functional_tests',
                                 src_base='..',
                                 workdir=workdir,
                                 factory_properties=fp)
 
     # HTML5 media tag performance/functional test using PyAuto.
     if R('avperf'):
-      platform_mapping = {
-        'win32': 'win32',
-        'darwin': 'mac',
-        'linux2': 'lucid64bit',
-      }
-
-      zip_platform = platform_mapping[self._target_platform]
-      workdir = os.path.join(f.working_dir, 'chrome-' + zip_platform)
       # Performance test should be run on virtual X buffer.
       fp['use_xvfb_on_linux'] = True
-      # Run test with matrix form input file.
-      f.AddAvPerfTests(factory_properties=fp, src_base='..', workdir=workdir,
-                       matrix=True, number_of_media_files=1,
-                       suite_name='AV_PERF')
-      # Run functional tests.
-      f.AddAvPerfTests(factory_properties=fp, src_base='..', workdir=workdir,
-                       matrix=False, number_of_media_files=1,
-                       suite_name='AV_FUNC')
+      f.AddMediaTests(factory_properties=fp, test_groups=self.MEDIA_TEST_GROUPS)
     if R('chromedriver_tests'):
       f.AddChromeDriverTest()
     if R('webdriver_tests'):
       f.AddWebDriverTest()
 
     # When adding a test that uses a new executable, update kill_processes.py.
 
     # Coverage tests.  Add coverage processing absoluely last, after
     # all tests have run.  Tests which run after coverage processing
     # don't get counted.
@@ skipping 172 matching lines @@
 
   def ChromiumAVPerfFactory(self, target='Release', clobber=False, tests=None,
                               mode=None, slave_type='BuilderTester',
                               options=None, compile_timeout=1200,
                               build_url=None, project=None,
                               factory_properties=None):
     self._solutions[0].custom_deps_list = [self.CUSTOM_DEPS_AVPERF]
     return self.ChromiumFactory(target, clobber, tests, mode, slave_type,
                                 options, compile_timeout, build_url, project,
                                 factory_properties)
-    
+
   def ChromiumNativeClientLatestFactory(
       self, target='Release', clobber=False, tests=None, mode=None,
       slave_type='BuilderTester', options=None, compile_timeout=1200,
       build_url=None, project=None, factory_properties=None,
       on_nacl_waterfall=True, use_chrome_lkgr=True):
     factory_properties = factory_properties or {}
     self._solutions[0].custom_deps_list = self.CUSTOM_DEPS_NACL_LATEST
     self._solutions[0].safesync_url = self.SAFESYNC_URL_CHROMIUM
     # Add an extra frivilous checkout of part of NativeClient when it is built
     # on the # NativeClient waterfall. This way, console view gets revision
@@ skipping 205 matching lines @@
     if 'cros_deps' not in [s.name for s in self._solutions]:
       self._solutions.append(gclient_factory.GClientSolution(
           config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps'))
     if 'asan.DEPS' not in [s.name for s in self._solutions]:
       self._solutions.append(gclient_factory.GClientSolution(
           'http://src.chromium.org/svn/trunk/deps/asan.DEPS',
           'asan.DEPS'))
     return self.ChromiumFactory(target, clobber, tests, mode, slave_type,
                                 options, compile_timeout, build_url, project,
                                 factory_properties)