LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix flaky NsdManagerTest

Browse Source 
Bad synchronization between the mock handler and the test assertions
were causing testDiscoverService() to sometime fails (1/50 ~ 1/100 repro
rate).

Bug: 32561414
Bug: 62918393
Test: runtest frameworks-net, NsdManager#testDiscoverService now passes
      1000 times without errors.
Change-Id: I0308cdf48fc6bdc2fc9b4e8f7d5241a1cf2ea443
This commit is contained in:
Hugo Benichi
2017-09-08 09:03:54 +09:00
parent 454d55d822
commit ce2d1859b2
1 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
tests/net/java/android/net/nsd/NsdManagerTest.java
View File

@@ -60,7 +60,7 @@ public class NsdManagerTest {
NsdManager mManager; NsdManager mManager;
long mTimeoutMs = 100; // non-final so that tests can adjust the value. long mTimeoutMs = 200; // non-final so that tests can adjust the value.
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
@@ -74,7 +74,7 @@ public class NsdManagerTest {
@After @After
public void tearDown() throws Exception { public void tearDown() throws Exception {
waitForIdleHandler(mServiceHandler, mTimeoutMs); mServiceHandler.waitForIdle(mTimeoutMs);
mServiceHandler.chan.disconnect(); mServiceHandler.chan.disconnect();
mServiceHandler.stop(); mServiceHandler.stop();
if (mManager != null) { if (mManager != null) {
@@ -334,9 +334,10 @@ public class NsdManagerTest {
} }
int verifyRequest(int expectedMessageType) { int verifyRequest(int expectedMessageType) {
mServiceHandler.waitForIdle(mTimeoutMs);
verify(mServiceHandler, timeout(mTimeoutMs)).handleMessage(any()); verify(mServiceHandler, timeout(mTimeoutMs)).handleMessage(any());
reset(mServiceHandler); reset(mServiceHandler);
Message received = mServiceHandler.lastMessage; Message received = mServiceHandler.getLastMessage();
assertEquals(NsdManager.nameOf(expectedMessageType), NsdManager.nameOf(received.what)); assertEquals(NsdManager.nameOf(expectedMessageType), NsdManager.nameOf(received.what));
return received.arg2; return received.arg2;
} }
@@ -347,31 +348,43 @@ public class NsdManagerTest {
// Implements the server side of AsyncChannel connection protocol // Implements the server side of AsyncChannel connection protocol
public static class MockServiceHandler extends Handler { public static class MockServiceHandler extends Handler {
public Context mContext; public final Context context;
public AsyncChannel chan; public AsyncChannel chan;
public volatile Message lastMessage; public Message lastMessage;
MockServiceHandler(Looper looper, Context context) { MockServiceHandler(Looper l, Context c) {
super(looper); super(l);
mContext = context; context = c;
}
synchronized Message getLastMessage() {
return lastMessage;
}
synchronized void setLastMessage(Message msg) {
lastMessage = obtainMessage();
lastMessage.copyFrom(msg);
}
void waitForIdle(long timeoutMs) {
waitForIdleHandler(this, timeoutMs);
} }
@Override @Override
public void handleMessage(Message msg) { public void handleMessage(Message msg) {
lastMessage = obtainMessage(); setLastMessage(msg);
lastMessage.copyFrom(msg);
if (msg.what == AsyncChannel.CMD_CHANNEL_FULL_CONNECTION) { if (msg.what == AsyncChannel.CMD_CHANNEL_FULL_CONNECTION) {
chan = new AsyncChannel(); chan = new AsyncChannel();
chan.connect(mContext, this, msg.replyTo); chan.connect(context, this, msg.replyTo);
chan.sendMessage(AsyncChannel.CMD_CHANNEL_FULLY_CONNECTED); chan.sendMessage(AsyncChannel.CMD_CHANNEL_FULLY_CONNECTED);
} }
} }
public void stop() { void stop() {
getLooper().quitSafely(); getLooper().quitSafely();
} }
public static MockServiceHandler create(Context context) { static MockServiceHandler create(Context context) {
HandlerThread t = new HandlerThread("mock-service-handler"); HandlerThread t = new HandlerThread("mock-service-handler");
t.start(); t.start();
return new MockServiceHandler(t.getLooper(), context); return new MockServiceHandler(t.getLooper(), context);