summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authornirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-26 23:36:37 +0000
committernirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-26 23:36:37 +0000
commit84ec056834c1625b7b7d316817b018564f76e22a (patch)
tree28035cf19b00a519a4fb88f97358be9075ab49fa /chrome
parentad2844a6ed6205b49898a86d2629617bd4d2cd47 (diff)
downloadchromium_src-84ec056834c1625b7b7d316817b018564f76e22a.zip
chromium_src-84ec056834c1625b7b7d316817b018564f76e22a.tar.gz
chromium_src-84ec056834c1625b7b7d316817b018564f76e22a.tar.bz2
Add override to turn off routers, fix undefinded pyauto_errors
Review URL: http://codereview.chromium.org/6902052 Patch from Kris Rambish <krisr@chromium.org>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83102 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/test/pyautolib/chromeos_network.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/chrome/test/pyautolib/chromeos_network.py b/chrome/test/pyautolib/chromeos_network.py
index 43f56a7..d9602487 100644
--- a/chrome/test/pyautolib/chromeos_network.py
+++ b/chrome/test/pyautolib/chromeos_network.py
@@ -196,7 +196,7 @@ class PyNetworkUITest(pyauto.PyUITest):
return [wifi for wifi in
self.NetworkScan().get('wifi_networks', {}).values()
if wifi.get('name') == ssid]
- except pyauto_errors.JSONInterfaceError:
+ except pyauto.pyauto_errors.JSONInterfaceError:
# Temporary fix until crosbug.com/14174 is fixed.
# NetworkScan is only used in updating the list of networks so errors
# thrown by it are not critical to the results of wifi tests that use
@@ -251,3 +251,14 @@ class PyNetworkUITest(pyauto.PyUITest):
logging.debug('Connecting to router %s.' % router_name)
return self.ConnectToWifiNetwork(service_path, passphrase)
+
+ def PowerDownAllRouters(self):
+ """Turns off all of the routers.
+
+ Convenience method that allows all subclasses to turn everything off and
+ start fresh.
+
+ """
+ if self._wifi_power_strip:
+ self._wifi_power_strip.TurnOffAllRouters()
+