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

Merge "Fix flake in testMobileDataAlwaysOn" am: 02ea3f55c1

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755251

Change-Id: Ide762b07177c861a7308690a8e39040de2414506
This commit is contained in:
Treehugger Robot
2021-07-07 04:11:20 +00:00
committed by Automerger Merge Worker
parent 3499d73016 02ea3f55c1
commit b9b4ee6d0e
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -1170,20 +1170,14 @@ public class ConnectivityServiceTest {
assertEquals(count, getMyRequestCount()); assertEquals(count, getMyRequestCount());
} }
@Override
public void terminate() {
super.terminate();
// Make sure there are no remaining requests unaccounted for.
HandlerUtils.waitForIdle(mHandlerSendingRequests, TIMEOUT_MS);
assertNull(mRequestHistory.poll(0, r -> true));
}
// Trigger releasing the request as unfulfillable // Trigger releasing the request as unfulfillable
public void triggerUnfulfillable(NetworkRequest r) { public void triggerUnfulfillable(NetworkRequest r) {
super.releaseRequestAsUnfulfillableByAnyFactory(r); super.releaseRequestAsUnfulfillableByAnyFactory(r);
} }
public void assertNoRequestChanged() { public void assertNoRequestChanged() {
// Make sure there are no remaining requests unaccounted for.
HandlerUtils.waitForIdle(mHandlerSendingRequests, TIMEOUT_MS);
assertNull(mRequestHistory.poll(0, r -> true)); assertNull(mRequestHistory.poll(0, r -> true));
} }
} }
@@ -3239,6 +3233,7 @@ public class ConnectivityServiceTest {
assertTrue(testFactory.getMyStartRequested()); assertTrue(testFactory.getMyStartRequested());
testFactory.terminate(); testFactory.terminate();
testFactory.assertNoRequestChanged();
if (networkCallback != null) mCm.unregisterNetworkCallback(networkCallback); if (networkCallback != null) mCm.unregisterNetworkCallback(networkCallback);
handlerThread.quit(); handlerThread.quit();
} }
@@ -3323,6 +3318,7 @@ public class ConnectivityServiceTest {
testFactory.setScoreFilter(42); testFactory.setScoreFilter(42);
testFactory.terminate(); testFactory.terminate();
testFactory.assertNoRequestChanged();
if (i % 2 == 0) { if (i % 2 == 0) {
try { try {
@@ -4624,6 +4620,9 @@ public class ConnectivityServiceTest {
// and the test factory should see it now that it isn't hopelessly outscored. // and the test factory should see it now that it isn't hopelessly outscored.
mCellNetworkAgent.disconnect(); mCellNetworkAgent.disconnect();
cellNetworkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); cellNetworkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent);
// Wait for the network to be removed from internal structures before
// calling synchronous getter
waitForIdle();
assertLength(1, mCm.getAllNetworks()); assertLength(1, mCm.getAllNetworks());
testFactory.expectRequestAdd(); testFactory.expectRequestAdd();
testFactory.assertRequestCountEquals(1); testFactory.assertRequestCountEquals(1);
@@ -4634,6 +4633,7 @@ public class ConnectivityServiceTest {
mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR); mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR);
mCellNetworkAgent.connect(true); mCellNetworkAgent.connect(true);
cellNetworkCallback.expectAvailableThenValidatedCallbacks(mCellNetworkAgent); cellNetworkCallback.expectAvailableThenValidatedCallbacks(mCellNetworkAgent);
waitForIdle();
assertLength(2, mCm.getAllNetworks()); assertLength(2, mCm.getAllNetworks());
testFactory.expectRequestRemove(); testFactory.expectRequestRemove();
testFactory.assertRequestCountEquals(0); testFactory.assertRequestCountEquals(0);
@@ -4645,8 +4645,9 @@ public class ConnectivityServiceTest {
cellNetworkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); cellNetworkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent);
waitForIdle(); waitForIdle();
assertLength(1, mCm.getAllNetworks()); assertLength(1, mCm.getAllNetworks());
} finally {
testFactory.terminate(); testFactory.terminate();
testFactory.assertNoRequestChanged();
} finally {
mCm.unregisterNetworkCallback(cellNetworkCallback); mCm.unregisterNetworkCallback(cellNetworkCallback);
handlerThread.quit(); handlerThread.quit();
} }