diff options
author | krisr@chromium.org <krisr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-18 21:48:27 +0000 |
---|---|---|
committer | krisr@chromium.org <krisr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-18 21:48:27 +0000 |
commit | 413b4fa0129845fba091b6655efd10dcec2f24a4 (patch) | |
tree | 1c5c8e4ba1e5e6d4e064c5ec732cf80f898e4200 | |
parent | e152f1f67d4e55f062023101d0bb2f79ec6b7221 (diff) | |
download | chromium_src-413b4fa0129845fba091b6655efd10dcec2f24a4.zip chromium_src-413b4fa0129845fba091b6655efd10dcec2f24a4.tar.gz chromium_src-413b4fa0129845fba091b6655efd10dcec2f24a4.tar.bz2 |
Move ForgetAllRememberedNetworks to pyauto.py since it makes more sense to be there and that will make it available to autotests using pyauto.
TEST=Ran it
BUG=None
Review URL: https://chromiumcodereview.appspot.com/10119028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132875 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/test/pyautolib/chromeos_network.py | 5 | ||||
-rwxr-xr-x | chrome/test/pyautolib/pyauto.py | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/test/pyautolib/chromeos_network.py b/chrome/test/pyautolib/chromeos_network.py index 660a6da..3c60095 100644 --- a/chrome/test/pyautolib/chromeos_network.py +++ b/chrome/test/pyautolib/chromeos_network.py @@ -166,11 +166,6 @@ class PyNetworkUITest(pyauto.PyUITest): for iface in routes: self.default_routes[iface[-1]] = dict(zip(route_table_headers, iface)) - def ForgetAllRememberedNetworks(self): - """Forgets all networks that the device has marked as remembered.""" - for service in self.GetNetworkInfo()['remembered_wifi']: - self.ForgetWifiNetwork(service) - def _SetServiceOrder(self, service_order): self._GetFlimflamManager().SetServiceOrder(service_order) # Flimflam throws a dbus exception if device is already disabled. This diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py index a835b6c..7cf2243 100755 --- a/chrome/test/pyautolib/pyauto.py +++ b/chrome/test/pyautolib/pyauto.py @@ -1027,7 +1027,7 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase): if self._GetResultFromJSONRequestDiagnostics(): # Browser info, worked, that means this hook had a problem additional_info = ('The browser process ID %d still exists. ' - 'PyAuto was able to get obtain browser info. It ' + 'PyAuto was able to obtain browser info. It ' 'is possible this hook is broken.' % _BROWSER_PID) else: @@ -4297,6 +4297,11 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase): } return self._GetResultFromJSONRequest(cmd_dict, windex=windex) + def ForgetAllRememberedNetworks(self): + """Forgets all networks that the device has marked as remembered.""" + for service in self.GetNetworkInfo()['remembered_wifi']: + self.ForgetWifiNetwork(service) + def ForgetWifiNetwork(self, service_path): """Forget a remembered network by its service path. |