Merge "Add TetheringPrivilegedTests to postsubmit"
This commit is contained in:
@@ -22,6 +22,11 @@
|
|||||||
"name": "TetheringIntegrationTests"
|
"name": "TetheringIntegrationTests"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"postsubmit": [
|
||||||
|
{
|
||||||
|
"name": "TetheringPrivilegedTests"
|
||||||
|
}
|
||||||
|
],
|
||||||
"mainline-presubmit": [
|
"mainline-presubmit": [
|
||||||
{
|
{
|
||||||
"name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
|
"name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ import android.net.InetAddresses;
|
|||||||
import android.net.MacAddress;
|
import android.net.MacAddress;
|
||||||
import android.net.util.InterfaceParams;
|
import android.net.util.InterfaceParams;
|
||||||
import android.net.util.TetheringUtils;
|
import android.net.util.TetheringUtils;
|
||||||
|
import android.os.Build;
|
||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
import android.os.HandlerThread;
|
import android.os.HandlerThread;
|
||||||
import android.os.IBinder;
|
import android.os.IBinder;
|
||||||
@@ -38,8 +39,9 @@ import android.os.Looper;
|
|||||||
|
|
||||||
import androidx.test.InstrumentationRegistry;
|
import androidx.test.InstrumentationRegistry;
|
||||||
import androidx.test.filters.SmallTest;
|
import androidx.test.filters.SmallTest;
|
||||||
import androidx.test.runner.AndroidJUnit4;
|
|
||||||
|
|
||||||
|
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
|
||||||
|
import com.android.testutils.DevSdkIgnoreRunner;
|
||||||
import com.android.testutils.TapPacketReader;
|
import com.android.testutils.TapPacketReader;
|
||||||
import com.android.testutils.TapPacketReaderRule;
|
import com.android.testutils.TapPacketReaderRule;
|
||||||
|
|
||||||
@@ -54,7 +56,8 @@ import org.mockito.MockitoAnnotations;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
|
|
||||||
@RunWith(AndroidJUnit4.class)
|
@RunWith(DevSdkIgnoreRunner.class)
|
||||||
|
@IgnoreUpTo(Build.VERSION_CODES.R)
|
||||||
@SmallTest
|
@SmallTest
|
||||||
public class DadProxyTest {
|
public class DadProxyTest {
|
||||||
private static final int DATA_BUFFER_LEN = 4096;
|
private static final int DATA_BUFFER_LEN = 4096;
|
||||||
|
|||||||
@@ -31,9 +31,8 @@ import android.system.ErrnoException;
|
|||||||
import android.system.OsConstants;
|
import android.system.OsConstants;
|
||||||
import android.util.ArrayMap;
|
import android.util.ArrayMap;
|
||||||
|
|
||||||
import androidx.test.runner.AndroidJUnit4;
|
|
||||||
|
|
||||||
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
|
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
|
||||||
|
import com.android.testutils.DevSdkIgnoreRunner;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.BeforeClass;
|
import org.junit.BeforeClass;
|
||||||
@@ -45,7 +44,7 @@ import java.util.NoSuchElementException;
|
|||||||
import java.util.concurrent.atomic.AtomicInteger;
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
|
||||||
|
|
||||||
@RunWith(AndroidJUnit4.class)
|
@RunWith(DevSdkIgnoreRunner.class)
|
||||||
@IgnoreUpTo(Build.VERSION_CODES.R)
|
@IgnoreUpTo(Build.VERSION_CODES.R)
|
||||||
public final class BpfMapTest {
|
public final class BpfMapTest {
|
||||||
// Sync from packages/modules/Connectivity/Tethering/bpf_progs/offload.c.
|
// Sync from packages/modules/Connectivity/Tethering/bpf_progs/offload.c.
|
||||||
|
|||||||
Reference in New Issue
Block a user