commit 7af74d709541b93710e3dc5b5253c02d1cd39751
author Hungming Chen <nuccachen@google.com> Mon Dec 05 17:08:19 2022 +0800
committer Nucca Chen <nuccachen@google.com> Tue Dec 06 15:39:25 2022 +0000
tree 52ce97f7e0b64e540ce9a4aad0980d35b1144efd
parent 26d3723f646bcaf914c119674dc75eeb09f419a6

DO NOT MERGE: don't test BPF tethering offload in CTS

testTetherUdpV4AfterR verifies BPF map content that is going to
break on Android 13 devices with newer mainline module versions
which are going to support CLAT tethering offload.

The CLAT tethering offload requires BPF map format modification
which will break CTS for T.

This is for Android 13 only because testTetherUdpV4AfterR is
added since T and the BPF offload test has been moved from CTS
to MTS.

Changes:

Before:
- testTetherUdpV4UpToR: test tethering basic function on R.
- testTetherUdpV4AfterR: test tethering basic function and BPF
  tethering offload on S+.

After:
- testTetherUdpV4: test tethering basic function on R+.
  (renamed from testTetherUdpV4UpToR)
- testTetherUdpV4AfterR: (suppressed)

Bug: 258637850
Test: atest EthernetTetheringTest
Change-Id: Ia75347094fd7819c5dc68e05fcaac5c698c7729e

Tethering/tests/integration/src/android/net/EthernetTetheringTest.java

diff --git a/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java b/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
index 5869f2b..e83d4cb 100644
--- a/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
+++ b/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
@@ -85,7 +85,6 @@
 import com.android.net.module.util.structs.Ipv6Header;
 import com.android.net.module.util.structs.UdpHeader;
 import com.android.testutils.DevSdkIgnoreRule;
-import com.android.testutils.DevSdkIgnoreRule.IgnoreAfter;
 import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
 import com.android.testutils.DeviceInfoUtils;
 import com.android.testutils.DumpTestUtils;
@@ -95,6 +94,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -1062,8 +1062,7 @@
     }
 
     @Test
-    @IgnoreAfter(Build.VERSION_CODES.R)
-    public void testTetherUdpV4UpToR() throws Exception {
+    public void testTetherUdpV4() throws Exception {
         initializeTethering();
         runUdp4Test(new TetheringTester(mDownstreamReader), new RemoteResponder(mUpstreamReader),
                 false /* usingBpf */);
@@ -1095,10 +1094,12 @@
         assertTrue(isUdpOffloadSupportedByKernel("5.10.0"));
     }
 
+    // b/258637850 - this test will break with newer mainline modules on T due to support CLAT
+    // tethering offload which changes BPF map format, so it has to be suppressed in CTS for T.
+    @Ignore
     // TODO: refactor test testTetherUdpV4* into IPv4 UDP non-offload and offload tests.
     // That can be easier to know which feature is verified from test results.
     @Test
-    @IgnoreUpTo(Build.VERSION_CODES.R)
     public void testTetherUdpV4AfterR() throws Exception {
         initializeTethering();
         final String kernelVersion = VintfRuntimeInfo.getKernelVersion();