joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Add NetworkStackModuleTest annotation on the specific test case.

Browse source 
EthernetTetheringTest#testTetherZeroLengthDhcpPacket requires the latest
NetworkStack module, otherwise, the test will fail due to the loss of
the fix. Apply @NetworkStackModuleTest to exclude this testcase from
target test suite CtsTetheringTestLatestSdk.

Bug: 283200648
Test: atest CtsTetheringTestLatestSdk
Change-Id: Iebfb043e2b71427a6feaf90788fe79b6ab6b678d
This commit is contained in:
Xiao Ma 2023-06-01 13:36:46 +09:00
commit 161b70c587
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
TEST_MAPPING
View file

@ -226,7 +226,12 @@
]
},
{
"name": "CtsTetheringTestLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
"name": "CtsTetheringTestLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
"options": [
{
"exclude-annotation": "com.android.testutils.NetworkStackModuleTest"
}
]
}
],
"mainline-postsubmit": [
@ -236,8 +241,13 @@
"keywords": ["sim"]
},
{
"name": "CtsTetheringTestLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
"keywords": ["sim"]
"name": "CtsTetheringTestLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
"keywords": ["sim"],
"options": [
{
"exclude-annotation": "com.android.testutils.NetworkStackModuleTest"
}
]
}
],
"imports": [

3
Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
View file

@ -65,6 +65,7 @@ import com.android.net.module.util.structs.Ipv4Header;
import com.android.net.module.util.structs.UdpHeader;
import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
import com.android.testutils.NetworkStackModuleTest;
import com.android.testutils.TapPacketReader;
import org.junit.Rule;
@ -860,6 +861,8 @@ public class EthernetTetheringTest extends EthernetTetheringTestBase {
(byte) 0x00, (byte) 0x08, (byte) 0x3a, (byte) 0xdf
};
// This test requires the update in NetworkStackModule(See b/269692093).
@NetworkStackModuleTest
@Test
public void testTetherZeroLengthDhcpPacket() throws Exception {
final TetheringTester tester = initTetheringTester(toList(TEST_IP4_ADDR),