Modify power_LoadTest Extension to pull in test parameters.

client/site_tests/power_LoadTest/power_LoadTest.py

-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# 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, site_power_status
 from autotest_lib.client.cros import backchannel, cros_ui, cros_ui_test
 from autotest_lib.client.cros import httpd, login
 
 from autotest_lib.client.cros import flimflam_test_path
@@ skipping 92 matching lines @@
 
         # record the max backlight level
         cmd = 'backlight-tool --get_max_brightness'
         self._max_backlight = int(utils.system_output(cmd).rstrip())
         self._tmp_keyvals['level_backlight_max'] = self._max_backlight
 
         # fix up file perms for the power test extension so that chrome
         # can access it
         os.system('chmod -R 755 %s' % self.bindir)
 
-        # TODO (bleung) :
-        # The new external extension packed crx means we can't pass params by
-        # modifying params.js
-        # Possible solution :
-        # - modify extension to not start until we poke it from the browser.
-        #       then pass through URL.
-
-        # write test parameters to the power extension's params.js file
-        # self._ext_path = os.path.join(self.bindir, 'extension')
-        # self._write_ext_params()
+        # write test parameters to the params.js file to be read by the test
+        # extension.
+        self._write_ext_params()
 
         # copy external_extensions.json to known location
         self._json_path = os.path.join(self.bindir, '..')
         shutil.copy(os.path.join(self.bindir, 'external_extensions.json'),
                                  self._json_path)
 
         # setup a HTTP Server to listen for status updates from the power
         # test extension
         self._testServer = httpd.HTTPListener(8001, docroot=self.bindir)
         self._testServer.run()
@@ skipping 104 matching lines @@
             jsonfile = os.path.join(self._json_path, 'external_extensions.json')
             if os.path.exists(jsonfile):
                 os.system('rm -f %s' % jsonfile)
         # re-enable powerd
         os.system('start powerd')
         if login.logged_in():
             login.attempt_logout()
         # cleanup backchannel interface
         if self._force_wifi:
             backchannel.teardown()
-
+        self._testServer.stop()
 
     def _percent_current_charge(self):
         return self._power_status.battery[0].charge_now * 100 / \
                self._power_status.battery[0].charge_full_design
 
 
     def _write_ext_params(self):
         data = ''
         template= 'var %s = %s;\n'
         for k in params_dict:
             data += template % (k, getattr(self, params_dict[k]))
 
-        filename = os.path.join(self._ext_path, 'params.js')
+        filename = os.path.join(self.bindir, 'params.js')
         utils.open_write_close(filename, data)
 
         logging.debug('filename ' + filename)
         logging.debug(data)
 
 
     def _do_wait(self, verbose, seconds, latch):
         latched = False
         low_battery = False
         total_time = seconds + 60
@@ skipping 51 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