Commit 992588ca authored Dec 04, 2017 by Michael Plass

Fix flaky WifiTrackerTest

The rssiChangeBroadcastShouldUpdateConnectedAp uses two CountDownLatch instances to
synchronize the events on the main thread and the handler thread. The "latch" informs
the main thread that mockWifiManager.getConnectionInfo() has been called and allows it
to proceed, and "mAccessPointsChangedLatch" notes that onAccessPointsChanged is called.
But mAccessPointsChangedLatch was assigned after "latch" released the main thread,
so that on occasion the main thread could try to use it before this assignment, causing
the timeout.

Move the assignment of mAccessPointsChangedLatch to before the body of the test
to prevent this race.

Bug: 70163367
Test: runtest --path frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I62c1ef9a2155ffbd08b5e07e94723b28102d1f6d

parent c9f1a9e3

packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -723,9 +723,9 @@ public class WifiTrackerTest {
	CountDownLatch latch = new CountDownLatch(1);		CountDownLatch latch = new CountDownLatch(1);

	// Once the new info has been fetched, we need to wait for the access points to be copied		// Once the new info has been fetched, we need to wait for the access points to be copied
			mAccessPointsChangedLatch = new CountDownLatch(1);
	doAnswer(invocation -> {		doAnswer(invocation -> {
	latch.countDown();		latch.countDown();
	mAccessPointsChangedLatch = new CountDownLatch(1);
	return info;		return info;
	}).when(mockWifiManager).getConnectionInfo();		}).when(mockWifiManager).getConnectionInfo();