power_LoadTest: Add parameter for custom tasks

client/site_tests/power_LoadTest/extension/urls.js

 // Copyright (c) 2010 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.
 
 // List of tasks to accomplish
 var URLS = new Array();
 
 var ViewGDoc = ('http://docs.google.com/RawDocContents?action=fetch&' +
                 'justBody=false&revision=_latest&editMode=true&docID=');
 
 var tasks = [
   {
     // Chrome browser window 1. This window remains open for the entire test.
-    'type': 'window',
+    type: 'window',
+    name: 'background',
     start: 0,
-    duration: 60 * 60 * 1000,
+    duration: minutes(2),
     tabs: [
      'http://www.cnn.com',
      'http://news.google.com',
      'http://finance.yahoo.com',
      'http://clothing.shop.ebay.com/Womens-Shoes-/63889/i.html',
      'http://www.facebook.com'
     ]
   },
   {
     // Page cycle through popular external websites for 36 minutes
     type: 'cycle',
     name: 'web',
     start: 0,
-    duration: 36 * 60 * 1000,
-    delay: 60 * 1000, // A minute on each page
-    timeout: 10 * 1000,
+    duration: minutes(36),
+    delay: seconds(10), // A minute on each page

[Sameer Nanda, 2011/03/31 23:42:22]

this should be seconds(60)
nice cleanup, btw :)

[Simon Que, 2011/04/01 21:37:15]

Done.

+    timeout: seconds(10),
     focus: true,
     urls: URLS,
   },
   {
     // After 36 minutes, actively read e-mail for 12 minutes
     type: 'cycle',
     name: 'email',
-    start: 36 * 60 * 1000 + 1 * 1000,
-    duration: 12 * 60 * 1000 - 1 * 1000,
-    delay: 5 * 60 * 1000, // 5 minutes between full gmail refresh
-    timeout: 10 * 1000,
+    start: minutes(36) + seconds(1),
+    duration: minutes(12) - seconds(1),
+    delay: minutes(5), // 5 minutes between full gmail refresh
+    timeout: seconds(10),
     focus: true,
     urls: [
        'http://gmail.com',
        'http://mail.google.com'
     ],
   },
   {
     // After 36 minutes, start streaming audio (background tab), total playtime
     // 12 minutes
     type: 'cycle',
     name: 'audio',
-    start: 36 * 60 * 1000,
-    duration: 12 * 60 * 1000,
-    delay: 12 * 60 * 1000,
-    timeout: 10 * 1000,
+    start: minutes(36),
+    duration: minutes(12),
+    delay: minutes(12),
+    timeout: seconds(10),
     focus: false,
     urls: [
       'http://www.bbc.co.uk/worldservice/audioconsole/?stream=live',
       'http://www.npr.org/templates/player/mediaPlayer.html?action=3&t=live1',
       'http://www.cbc.ca/radio2/channels/popup.html?stream=classical'
     ]
   },
   {
     // After 48 minutes, play with Google Docs for 6 minutes
     type: 'cycle',
     name: 'docs',
-    start: 48 * 60 * 1000,
-    duration: 6 * 60 * 1000,
-    delay: 60 * 1000, // A minute on each page
-    timeout: 10 * 1000,
+    start: minutes(48),
+    duration: minutes(6),
+    delay: minutes(1), // A minute on each page
+    timeout: seconds(10),
     focus: true,
     urls: [
        ViewGDoc + '0AaLGACl774zLZGRuYzlibWtfMXJzbmdoamcy',
        ViewGDoc + '0AaLGACl774zLZGRuYzlibWtfMGRkcmY4emNu'
     ],
   },
   {
     // After 54 minutes, watch Google IO for 6 minutes
     type: 'window',
     name: 'video',
-    start: 54 * 60 * 1000,
-    duration: 6 * 60 * 1000,
+    start: minutes(54),
+    duration: minutes(6),
     focus: true,
     tabs: [
         'http://www.youtube.com/v/ecI_hCBGEIM&autoplay=1'
     ]
   },
 ];
 
 
 // List of URLs to cycle through
 var u_index = 0;
@@ skipping 44 matching lines @@
 URLS[u_index++] = 'http://www.netflix.com';
 URLS[u_index++] = 'http://www.fastclick.net';
 URLS[u_index++] = 'http://www.windows.com';
 URLS[u_index++] = 'http://www.questionmarket.com';
 URLS[u_index++] = 'http://www.nytimes.com';
 URLS[u_index++] = 'http://www.toysrus.com';
 URLS[u_index++] = 'http://www.allrecipes.com';
 URLS[u_index++] = 'http://www.overstock.com';
 URLS[u_index++] = 'http://www.comcast.net';