Fixing the Belkin1105 and Belkinf7d1301 v1_2 configurators.
BUG=chromium:354549,352412
TEST=ChaosPSK
Change-Id: Id1c9587128f59bf440266a1aecaa24de6ae51ebe
Reviewed-on: https://chromium-review.googlesource.com/191802
Reviewed-by: Kris Rambish <krisr@chromium.org>
Tested-by: Bindu Mahadev <bmahadev@chromium.org>
diff --git a/server/cros/chaos_ap_configurators/belkinF9K1105_ap_configurator.py b/server/cros/chaos_ap_configurators/belkinF9K1105_ap_configurator.py
index 2eaf54f..cd30864 100644
--- a/server/cros/chaos_ap_configurators/belkinF9K1105_ap_configurator.py
+++ b/server/cros/chaos_ap_configurators/belkinF9K1105_ap_configurator.py
@@ -168,10 +168,11 @@
self.set_wait_time(120)
self.wait.until(lambda _: page_title in self.driver.title)
except:
+ self.driver.refresh()
+ # If page did not load even after a refresh just continue
+ # because we already clicked the save button.
if not page_title in self.driver.title:
- raise RuntimeError('Expected %s in title, but got %s as '
- 'title.' % (page_title,
- self.driver.title))
+ pass
finally:
self.restore_default_wait_time()
else:
diff --git a/server/cros/chaos_ap_configurators/belkinF9K_ap_configurator.py b/server/cros/chaos_ap_configurators/belkinF9K_ap_configurator.py
index 2747f6d..c724d71 100644
--- a/server/cros/chaos_ap_configurators/belkinF9K_ap_configurator.py
+++ b/server/cros/chaos_ap_configurators/belkinF9K_ap_configurator.py
@@ -252,7 +252,7 @@
def _set_security_wpapsk(self, security, shared_key, update_interval=None):
- key_field = '//input[@name="wpa_key_text"]'
+ key_field = '//input[@name="wpa_key_pass"]'
psk = '//select[@name="authentication"]'
self.select_item_from_popup_by_xpath('WPA/WPA2-Personal (PSK)',
self.security_popup,
