commit af3800355bf5512cbde344861c60e292e1cb90bb
author Richard Frankel <rofrankel@google.com> Wed Mar 30 20:56:52 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 30 20:56:52 2016 +0000
tree 8935de904f9a978a66e9e13c8fb0346ef45d1a4c
parent dce56102c2656b3552c64db01d596dd11e785b1e
parent faaa29a4a3e30c3da4fd54494b29419dee317842

Merge "Revert "Revert "/bin/wifi:  Lock /bin/wifi to prevent simultaneous calls."""

waveguide/wifiblaster_controller_test.py

diff --git a/waveguide/wifiblaster_controller_test.py b/waveguide/wifiblaster_controller_test.py
index 4d97084..04e71f8 100755
--- a/waveguide/wifiblaster_controller_test.py
+++ b/waveguide/wifiblaster_controller_test.py
@@ -196,26 +196,17 @@
       old_to = wc.NextMeasurement()
       wc.Poll(401)
       wvtest.WVPASSNE(old_to, wc.NextMeasurement())
-      for t in xrange(402, 410):
+      for t in xrange(402, 500):
         wc.Poll(t)
       wvtest.WVPASSGE(CountRuns(), 1)
 
-      # Switch back to a longer poll interval.
-      WriteConfig('interval', '36000')
-      ok = False
-      for t in xrange(410, 600):
-        wc.Poll(t)
-        if wc.NextMeasurement() > t + 200:
-          ok = True
-      wvtest.WVPASS(ok)
-
-      # And then request all clients to be measured and make sure it only
-      # happens once. Disable automated measurement so they are not counted.
+      # Request all clients to be measured and make sure it only happens once.
+      # Disable automated measurement so they are not counted.
       WriteConfig('interval', '0')
       WriteConfig('measureall', str(faketime[0]))
-      wc.Poll(600)
+      wc.Poll(500)
       wvtest.WVPASSEQ(CountRuns(), 1)
-      wc.Poll(601)
+      wc.Poll(501)
       wvtest.WVPASSEQ(CountRuns(), 0)
   finally:
     time.time = oldtime