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

Merge "Fix EtherentTetheringTest flaky" into main am: 013425e27e

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

Change-Id: If20fc8a072373f2b0de50c0390e3af3d2928121e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mark Chien
2023-07-28 06:05:29 +00:00
committed by Automerger Merge Worker
parent c99f7e5032 013425e27e
commit 5622bd0617
2 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java
View File

@@ -58,6 +58,8 @@ import android.net.TetheringManager.TetheringEventCallback;
import android.net.TetheringManager.TetheringRequest;
import android.net.TetheringTester.TetheredDevice;
import android.net.cts.util.CtsNetUtils;
import android.net.cts.util.CtsTetheringUtils;
import android.net.cts.util.CtsTetheringUtils.TestTetheringEventCallback;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.SystemClock;
@@ -75,6 +77,7 @@ import com.android.testutils.TestNetworkTracker;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import java.io.FileDescriptor;
import java.net.Inet4Address;
@@ -161,6 +164,28 @@ public abstract class EthernetTetheringTestBase {
private TapPacketReader mDownstreamReader;
private MyTetheringEventCallback mTetheringEventCallback;
@BeforeClass
public static void setUpOnce() throws Exception {
// The first test case may experience tethering restart with IP conflict handling.
// Tethering would cache the last upstreams so that the next enabled tethering avoids
// picking up the address that is in conflict with the upstreams. To protect subsequent
// tests, turn tethering on and off before running them.
final Context ctx = InstrumentationRegistry.getInstrumentation().getContext();
final CtsTetheringUtils utils = new CtsTetheringUtils(ctx);
final TestTetheringEventCallback callback = utils.registerTetheringEventCallback();
try {
if (!callback.isWifiTetheringSupported(ctx)) return;
callback.expectNoTetheringActive();
utils.startWifiTethering(callback);
callback.getCurrentValidUpstream();
utils.stopWifiTethering(callback);
} finally {
utils.unregisterTetheringEventCallback(callback);
}
}
@Before
public void setUp() throws Exception {
mHandlerThread = new HandlerThread(getClass().getSimpleName());

23
tests/cts/net/util/java/android/net/cts/util/CtsTetheringUtils.java
View File

@@ -393,21 +393,28 @@ public final class CtsTetheringUtils {
}
public void assumeTetheringSupported() {
assumeTrue(isTetheringSupported());
}
private boolean isTetheringSupported() {
final ArrayTrackRecord<CallbackValue>.ReadHead history =
mHistory.newReadHead();
assertNotNull("No onSupported callback", history.poll(TIMEOUT_MS, (cv) -> {
if (cv.callbackType != CallbackType.ON_SUPPORTED) return false;
final CallbackValue result = history.poll(TIMEOUT_MS, (cv) -> {
return cv.callbackType == CallbackType.ON_SUPPORTED;
});
assumeTrue(cv.callbackParam2 == 1 /* supported */);
return true;
}));
assertNotNull("No onSupported callback", result);
return result.callbackParam2 == 1 /* supported */;
}
public void assumeWifiTetheringSupported(final Context ctx) throws Exception {
assumeTetheringSupported();
assumeTrue(isWifiTetheringSupported(ctx));
}
assumeTrue(!getTetheringInterfaceRegexps().getTetherableWifiRegexs().isEmpty());
assumeTrue(isPortableHotspotSupported(ctx));
public boolean isWifiTetheringSupported(final Context ctx) throws Exception {
return isTetheringSupported()
&& !getTetheringInterfaceRegexps().getTetherableWifiRegexs().isEmpty()
&& isPortableHotspotSupported(ctx);
}
public TetheringInterfaceRegexps getTetheringInterfaceRegexps() {