From 8666bc8c2337c7c92e0c9bb4c0230a369ce6253b Mon Sep 17 00:00:00 2001 From: Ningyuan Wang Date: Tue, 10 Oct 2017 13:19:44 -0700 Subject: [PATCH] CTS: update wifi scan timeout to 9 seconds This creates a new timeout constant for scan duration, so this test doesn't share timeout constant with other events. This also increases the scan timeout time to 9 seconds per our estimation. Bug: 67462981 Test: cts-tradefed run cts -m CtsNetTestCases -t android.net.wifi.cts.WifiManagerTest#testWifiScanTimestamp Change-Id: I7e1dea64bc8df3e4b31adbf8b5f05c8564a739b1 --- tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java index 754336af98..a849be50ff 100644 --- a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java +++ b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java @@ -77,6 +77,10 @@ public class WifiManagerTest extends AndroidTestCase { private static final String SSID2 = "\"WifiManagerTestModified\""; private static final String PROXY_TEST_SSID = "SomeProxyAp"; private static final String ADD_NETWORK_EXCEPTION_SUBSTR = "addNetwork"; + // A full single scan duration is about 6-7 seconds if country code is set + // to US. If country code is set to world mode (00), we would expect a scan + // duration of roughly 8 seconds. So we set scan timeout as 9 seconds here. + private static final int SCAN_TIMEOUT_MSEC = 9000; private static final int TIMEOUT_MSEC = 6000; private static final int WAIT_MSEC = 60; private static final int DURATION = 10000; @@ -202,7 +206,7 @@ public class WifiManagerTest extends AndroidTestCase { mMySync.expectedState = STATE_SCANNING; mScanResults = null; assertTrue(mWifiManager.startScan()); - long timeout = System.currentTimeMillis() + TIMEOUT_MSEC; + long timeout = System.currentTimeMillis() + SCAN_TIMEOUT_MSEC; while (System.currentTimeMillis() < timeout && mMySync.expectedState == STATE_SCANNING) mMySync.wait(WAIT_MSEC); }