Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(230)

Unified Diff: client/site_tests/power_LoadTest/power_LoadTest.py

Issue 5740004: Move site_chrome_test, site_logging, site_log_reader, site_crash_test into cros dir. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master
Patch Set: patch Created 9 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: client/site_tests/power_LoadTest/power_LoadTest.py
diff --git a/client/site_tests/power_LoadTest/power_LoadTest.py b/client/site_tests/power_LoadTest/power_LoadTest.py
index 97bc54a83005f8f1e1911e914755e0f22e5d818a..27033cb9a8cc7e08b58d4278fcfa36d9da587baf 100755
--- a/client/site_tests/power_LoadTest/power_LoadTest.py
+++ b/client/site_tests/power_LoadTest/power_LoadTest.py
@@ -5,7 +5,7 @@
import logging, os, shutil, sys, time
from autotest_lib.client.bin import site_backchannel, utils
from autotest_lib.client.common_lib import error, site_power_status
-from autotest_lib.client.cros import httpd, login, ui, ui_test
+from autotest_lib.client.cros import cros_ui_test, httpd, login, ui
sys.path.append(os.environ.get('SYSROOT', '') + '/usr/local/lib/flimflam/test')
import flimflam
@@ -21,17 +21,19 @@ params_dict = {
}
-class power_LoadTest(ui_test.UITest):
+class power_LoadTest(cros_ui_test.UITest):
version = 2
+
def ensure_login_complete(self):
"""
- Override ui_test.UITest's ensure_login_complete.
+ Override cros_ui_test.UITest's ensure_login_complete.
Do not use auth server and local dns for our test. We need to be
able to reach the web.
"""
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',
@@ -144,7 +146,7 @@ class power_LoadTest(ui_test.UITest):
self._ah_charge_start = self._power_status.battery[0].charge_now
self._wh_energy_start = self._power_status.battery[0].energy
- # from ui_test.UITest.initialize, sans authserver & local dns.
+ # from cros_ui_test.UITest.initialize, sans authserver & local dns.
(self.username, self.password) = self._UITest__resolve_creds(creds)
def run_once(self):
« no previous file with comments | « client/site_tests/power_Idle/power_Idle.py ('k') | client/site_tests/security_NetworkListeners/security_NetworkListeners.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698