Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 954eafa1 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Skip getConnectionOwnerUid tests on Q

The tests verify platform behavior of getConnectionOwnerUid for a bug
fixed in Q-QPR2, so cannot be run on all Q images.

Bug: 149063891
Test: atest NetworkStackTests
Change-Id: I7ffc1afbe80e8f8076be78bd74d7cc8f1e47dad2
parent 9018b1ca
Loading
Loading
Loading
Loading
+8 −0
Original line number Original line Diff line number Diff line
@@ -31,11 +31,13 @@ import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeTrue;


import android.app.Instrumentation;
import android.app.Instrumentation;
import android.content.Context;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.ConnectivityManager;
import android.net.netlink.StructNlMsgHdr;
import android.net.netlink.StructNlMsgHdr;
import android.os.Build;
import android.os.Process;
import android.os.Process;
import android.system.Os;
import android.system.Os;


@@ -43,6 +45,8 @@ import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
import androidx.test.runner.AndroidJUnit4;


import com.android.networkstack.apishim.ShimUtils;

import libcore.util.HexEncoding;
import libcore.util.HexEncoding;


import org.junit.Before;
import org.junit.Before;
@@ -191,6 +195,8 @@ public class InetDiagSocketTest {


    @Test
    @Test
    public void testGetConnectionOwnerUid() throws Exception {
    public void testGetConnectionOwnerUid() throws Exception {
        // Skip the test for API <= Q, as b/141603906 this was only fixed in Q-QPR2
        assumeTrue(ShimUtils.isReleaseOrDevelopmentApiAbove(Build.VERSION_CODES.Q));
        checkGetConnectionOwnerUid("::", null);
        checkGetConnectionOwnerUid("::", null);
        checkGetConnectionOwnerUid("::", "::");
        checkGetConnectionOwnerUid("::", "::");
        checkGetConnectionOwnerUid("0.0.0.0", null);
        checkGetConnectionOwnerUid("0.0.0.0", null);
@@ -204,6 +210,8 @@ public class InetDiagSocketTest {
    /* Verify fix for b/141603906 */
    /* Verify fix for b/141603906 */
    @Test
    @Test
    public void testB141603906() throws Exception {
    public void testB141603906() throws Exception {
        // Skip the test for API <= Q, as b/141603906 this was only fixed in Q-QPR2
        assumeTrue(ShimUtils.isReleaseOrDevelopmentApiAbove(Build.VERSION_CODES.Q));
        final InetSocketAddress src = new InetSocketAddress(0);
        final InetSocketAddress src = new InetSocketAddress(0);
        final InetSocketAddress dst = new InetSocketAddress(0);
        final InetSocketAddress dst = new InetSocketAddress(0);
        final int numThreads = 8;
        final int numThreads = 8;