commit 3f17989c75793bc8aa74a8b0fba80652f8c03d7c
author Richard Frankel <rofrankel@google.com> Wed Aug 03 20:46:08 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 03 20:46:08 2016 +0000
tree 05a2a0a18780c1411aad65b3f32ee45a18247369
parent 22aa6c12199820019d984bbb0dab4fec37b8cd0e
parent 31c3b35558a71239c23d33c204c0adeb5ab49adc

Merge "conman:  Experiment to prevent joining the WLAN on 2.4 GHz."

conman/connection_manager_test.py

diff --git a/conman/connection_manager_test.py b/conman/connection_manager_test.py
index 8960509..db8855d 100755
--- a/conman/connection_manager_test.py
+++ b/conman/connection_manager_test.py
@@ -721,6 +721,8 @@
   wvtest.WVPASS(c.has_status_files([status.P.CONNECTED_TO_OPEN]))
   wvtest.WVPASSEQ(c.last_provisioning_attempt.ssid, 's3')
   wvtest.WVPASSEQ(c.last_provisioning_attempt.bssid, 'ff:ee:dd:cc:bb:aa')
+  # The log upload happens on the next main loop after joining s3.
+  c.run_once()
   wvtest.WVPASSEQ(c.log_upload_count, 2)
 
   # Now, recreate the same WLAN configuration, which should be connected to.
@@ -789,6 +791,7 @@
   wvtest.WVPASS(c.acs())
   # Make sure we didn't scan on `band`.
   wvtest.WVPASSEQ(scan_count_for_band, c.wifi_for_band(band).wifi_scan_counter)
+  c.run_once()
   wvtest.WVPASSEQ(c.log_upload_count, 3)
 
   # Now re-create the WLAN config, connect to the WLAN, and make sure that s3 is
@@ -832,6 +835,7 @@
     c.run_once()
   s2_bss = iw.BssInfo('01:23:45:67:89:ab', 's2')
   wvtest.WVPASSEQ(c.wifi_for_band(band).last_successful_bss_info, s2_bss)
+  c.run_once()
   wvtest.WVPASSEQ(c.log_upload_count, 4)
 
   c.s2_fail = True
@@ -985,6 +989,7 @@
   wvtest.WVFAIL(c.bridge.current_route())
   wvtest.WVPASS(c.wifi_for_band('2.4').current_route())
   wvtest.WVFAIL(c.wifi_for_band('5').current_route())
+  c.run_once()
   wvtest.WVPASSEQ(c.log_upload_count, 1)
 
 
@@ -1078,6 +1083,7 @@
   wvtest.WVFAIL(c.bridge.current_route())
   wvtest.WVPASS(c.wifi_for_band('2.4').current_route())
   wvtest.WVPASS(c.wifi_for_band('5').current_route())
+  c.run_once()
   wvtest.WVPASSEQ(c.log_upload_count, 1)