commit edd11e673b92408a9ab4433aef69a95c3481d1ad
author Richard Frankel <rofrankel@google.com> Wed May 11 19:07:35 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 11 19:07:35 2016 +0000
tree 8835ee2b6abef1c6bd117dc77ec4319049272275
parent 1a79a9cd9dee37c1b0b52785816d6f8ce76eac82
parent f4124ed7530dc563acd3e663d7b2f478008b3e9b

Merge "conman:  Fix a flaky test." into wifitv

conman/connection_manager_test.py

diff --git a/conman/connection_manager_test.py b/conman/connection_manager_test.py
index f77f5db..ac52968 100755
--- a/conman/connection_manager_test.py
+++ b/conman/connection_manager_test.py
@@ -380,6 +380,13 @@
     while wifi_scan_counter == wifi.wifi_scan_counter:
       self.run_once()
 
+  def run_until_interface_update_and_scan(self, band):
+    wifi = self.wifi_for_band(band)
+    wifi_scan_counter = wifi.wifi_scan_counter
+    self.run_until_interface_update()
+    while wifi_scan_counter == wifi.wifi_scan_counter:
+      self.run_once()
+
   def has_status_files(self, files):
     return not set(files) - set(os.listdir(self._status_dir))
 
@@ -595,8 +602,7 @@
   c.delete_wlan_config('2.4')
   c.run_once()
   wvtest.WVFAIL(c.has_status_files([status.P.CONNECTED_TO_WLAN]))
-  c.run_until_interface_update()
-  c.run_until_scan('2.4')
+  c.run_until_interface_update_and_scan('2.4')
   c.run_until_interface_update()
   wvtest.WVPASS(c.has_status_files([status.P.CONNECTED_TO_OPEN]))
   wvtest.WVPASSEQ(c.last_provisioning_attempt.ssid, 's3')