power_LoadTest: Add parameter for custom tasks

client/site_tests/power_LoadTest/power_LoadTest.py

 # Copyright (c) 2011 The Chromium OS 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 logging, os, shutil, time
 from autotest_lib.client.bin import utils
 from autotest_lib.client.common_lib import error
 from autotest_lib.client.cros import backchannel, cros_ui, cros_ui_test
 from autotest_lib.client.cros import httpd, login, power_status
 from autotest_lib.client.cros import flimflam_test_path
 import flimflam
 
 params_dict = {
     'test_time_ms': '_mseconds',
     'should_scroll': '_should_scroll',
     'should_scroll_up': '_should_scroll_up',
     'scroll_loop': '_scroll_loop',
     'scroll_interval_ms': '_scroll_interval_ms',
     'scroll_by_pixels': '_scroll_by_pixels',
+    'tasks': '_tasks',
 }
 
 
 class power_LoadTest(cros_ui_test.UITest):
     auto_login = False
     version = 2
 
 
     def start_authserver(self):
         """
@@ skipping 12 matching lines @@
         """
         pass
 
 
     def initialize(self, creds='$default', percent_initial_charge_min=None,
                  check_network=True, loop_time=3600, loop_count=1,
                  should_scroll='true', should_scroll_up='true',
                  scroll_loop='false', scroll_interval_ms='10000',
                  scroll_by_pixels='600', low_battery_threshold=3,
                  verbose=True, force_wifi=False, wifi_ap='', wifi_sec='none',
-                 wifi_pw=''):
+                 wifi_pw='', tasks=""):
 
         """
         percent_initial_charge_min: min battery charge at start of test
         check_network: check that Ethernet interface is not running
         loop_count: number of times to loop the test for
         loop_time: length of time to run the test for in each loop
         should_scroll: should the extension scroll pages
         should_scroll_up: should scroll in up direction
         scroll_loop: continue scrolling indefinitely
         scroll_interval_ms: how often to scoll
         scroll_by_pixels: number of pixels to scroll each time
         """
         self._loop_time = loop_time
         self._loop_count = loop_count
         self._mseconds = self._loop_time * 1000
         self._verbose = verbose
         self._low_battery_threshold = low_battery_threshold
         self._should_scroll = should_scroll
         self._should_scroll_up = should_scroll_up
         self._scroll_loop = scroll_loop
         self._scroll_interval_ms = scroll_interval_ms
         self._scroll_by_pixels = scroll_by_pixels
         self._tmp_keyvals = {}
         self._power_status = power_status.get_status()
         self._json_path = None
         self._force_wifi = force_wifi
         self._testServer = None
+        self._tasks = '\'' + tasks + '\''
 
         # verify that initial conditions are met:
         if self._power_status.linepower[0].online:
             raise error.TestError(
                 'Running on AC power. Please remove AC power cable')
 
         percent_initial_charge = self._percent_current_charge()
         if percent_initial_charge_min and percent_initial_charge < \
                                           percent_initial_charge_min:
             raise error.TestError('Initial charge (%f) less than min (%f)'
@@ skipping 238 matching lines @@
         # set backlight level to 40% of max
         cmd = 'backlight-tool --set_brightness %d ' % (
               int(self._max_backlight * 0.4))
         os.system(cmd)
 
         # record brightness level
         cmd = 'backlight-tool --get_brightness'
         level = int(utils.system_output(cmd).rstrip())
         logging.info('backlight level is %d' % level)
         self._tmp_keyvals['level_backlight_current'] = level