summaryrefslogtreecommitdiffstats
path: root/chrome/test/pyautolib
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-21 18:46:33 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-21 18:46:33 +0000
commit62e0473828f213de9b13c35b9b7191ede3be3437 (patch)
tree5825fa7f1cf0ec63f5f182c2f4aad8aa34f1310e /chrome/test/pyautolib
parenta2290581bb3dc7678e6d7fede8fb4c3546742b51 (diff)
downloadchromium_src-62e0473828f213de9b13c35b9b7191ede3be3437.zip
chromium_src-62e0473828f213de9b13c35b9b7191ede3be3437.tar.gz
chromium_src-62e0473828f213de9b13c35b9b7191ede3be3437.tar.bz2
Enable 802.1X config in Join other network dialog
The network menu > Other Wi-Fi network... dialog now contains an "Advanced" button that opens a larger dialog with EAP connection type, certificates, etc. Removed unused browser_mode state in NetworkConfigView, fixed some method naming style issues, removed some unused parameters from test code. BUG=chromium-os:13476 TEST=Test connections to various Wi-Fi network types: normal public wifi, password protected wifi, hidden wifi with password, PEAP wifi, hidden PEAP wifi. Review URL: http://codereview.chromium.org/6877087 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/pyautolib')
-rw-r--r--chrome/test/pyautolib/pyauto.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py
index d799c64..ee2074a 100644
--- a/chrome/test/pyautolib/pyauto.py
+++ b/chrome/test/pyautolib/pyauto.py
@@ -2791,8 +2791,7 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
result = self._GetResultFromJSONRequest(cmd_dict, windex=-1, timeout=50000)
return result.get('error_string')
- def ConnectToHiddenWifiNetwork(self, ssid, security,
- password='', identity='', certpath=''):
+ def ConnectToHiddenWifiNetwork(self, ssid, security, password=''):
"""Connect to a wifi network by its service path.
Blocks until connection succeeds or fails.
@@ -2802,8 +2801,6 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
security: The network's security type. One of: 'SECURITY_NONE',
'SECURITY_WEP', 'SECURITY_WPA', 'SECURITY_RSN', 'SECURITY_8021X'
password: Passphrase for connecting to the wifi network.
- identity: Identity for 802.11x networks.
- certpath: Certificate path for 802.11x networks.
Returns:
An error string if an error occured.
@@ -2819,8 +2816,6 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
'ssid': ssid,
'security': security,
'password': password,
- 'identity': identity,
- 'certpath': certpath,
}
result = self._GetResultFromJSONRequest(cmd_dict, windex=-1, timeout=50000)
return result.get('error_string')