diff options
| author | stanleyw@chromium.org <stanleyw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-19 20:55:51 +0000 |
|---|---|---|
| committer | stanleyw@chromium.org <stanleyw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-19 20:55:51 +0000 |
| commit | 1730395f996faaa2097b7afa2b23c1def9f94e18 (patch) | |
| tree | d2f20976360505e6c0e0a9a00ff20c0a91f1f68f /chrome | |
| parent | 28f8600bbcb671e5da76f83d043a1b05b8e46f1b (diff) | |
| download | chromium_src-1730395f996faaa2097b7afa2b23c1def9f94e18.zip chromium_src-1730395f996faaa2097b7afa2b23c1def9f94e18.tar.gz chromium_src-1730395f996faaa2097b7afa2b23c1def9f94e18.tar.bz2 | |
Temporary fix for NetworkScan
BUG=
TEST=Run chromeos_wifi_compliance.py and should see no JSONInterfaceErrors from WaitUntilNetworkIsAvailable
Review URL: http://codereview.chromium.org/6878049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82152 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/test/pyautolib/chromeos_network.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/chrome/test/pyautolib/chromeos_network.py b/chrome/test/pyautolib/chromeos_network.py index f7fba95..43f56a7 100644 --- a/chrome/test/pyautolib/chromeos_network.py +++ b/chrome/test/pyautolib/chromeos_network.py @@ -192,9 +192,16 @@ class PyNetworkUITest(pyauto.PyUITest): """ def _GotWifiNetwork(): # Returns non-empty array if desired SSID is available. - return [wifi for wifi in - self.NetworkScan().get('wifi_networks', {}).values() - if wifi.get('name') == ssid] + try: + return [wifi for wifi in + self.NetworkScan().get('wifi_networks', {}).values() + if wifi.get('name') == ssid] + except 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 + # this method. + return True return self.WaitUntil(_GotWifiNetwork, timeout=timeout, retry_sleep=1) |