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

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

Issue 6479003: Move site_backchannel and site_tpm module into client/cros dir. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master
Patch Set: patch Created 9 years, 10 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
« no previous file with comments | « client/site_tests/network_3GStressEnable/network_3GStressEnable.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 84c67efcf2901705516fe621f493530eefa4e4da..0097c12d2d43f329927c84543aaba86a36aba5b8 100755
--- a/client/site_tests/power_LoadTest/power_LoadTest.py
+++ b/client/site_tests/power_LoadTest/power_LoadTest.py
@@ -3,9 +3,10 @@
# found in the LICENSE file.
import logging, os, shutil, time
-from autotest_lib.client.bin import site_backchannel, utils
+from autotest_lib.client.bin import utils
from autotest_lib.client.common_lib import error, site_power_status
-from autotest_lib.client.cros import cros_ui, cros_ui_test, httpd, login
+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
import flimflam
@@ -82,7 +83,7 @@ class power_LoadTest(cros_ui_test.UITest):
# specified WiFi AP.
if self._force_wifi:
# If backchannel is already running, don't run it again.
- if not site_backchannel.setup():
+ if not backchannel.setup():
raise error.TestError('Could not setup Backchannel network.')
# Note: FlimFlam is flaky after Backchannel setup sometimes. It may
@@ -97,7 +98,7 @@ class power_LoadTest(cros_ui_test.UITest):
mode='managed')[0]:
raise error.TestError('Could not connect to WiFi network.')
- if check_network and site_backchannel.is_network_iface_running('eth0'):
+ if check_network and backchannel.is_network_iface_running('eth0'):
raise error.TestError(
'Ethernet interface is active. Please remove Ethernet cable')
@@ -243,7 +244,7 @@ class power_LoadTest(cros_ui_test.UITest):
login.attempt_logout()
# cleanup backchannel interface
if self._force_wifi:
- site_backchannel.teardown()
+ backchannel.teardown()
def _percent_current_charge(self):
« no previous file with comments | « client/site_tests/network_3GStressEnable/network_3GStressEnable.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698