Do not run testDropPingReply before V
Also address a comment to directly pass 4 to the ApfV4Generator.
Test: TH
Change-Id: Ie362feb38a5d91c84de1fdcebb24f16453a86f1c
diff --git a/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt b/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt
index fcba530..1a535b4 100644
--- a/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt
+++ b/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt
@@ -382,12 +382,14 @@
addJumpIfR0NotEquals(0x81, BaseApfGenerator.PASS_LABEL)
}
+ // APF integration is mostly broken before V
+ @IgnoreUpTo(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
@Test
fun testDropPingReply() {
assumeApfVersionSupportAtLeast(4)
// clear any active APF filter
- var gen = ApfV4Generator(caps.apfVersionSupported).addPass()
+ var gen = ApfV4Generator(4).addPass()
installProgram(gen.generate())
readProgram() // wait for install completion
@@ -397,7 +399,7 @@
assertThat(packetReader.expectPingReply()).isEqualTo(data)
// Generate an APF program that drops the next ping
- gen = ApfV4Generator(caps.apfVersionSupported)
+ gen = ApfV4Generator(4)
// If not ICMPv6 Echo Reply -> PASS
gen.addPassIfNotIcmpv6EchoReply()