LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix flaky test in NattKeepalivePacketDataTest" am: d4894956b6 am: 3b6f775cd5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2626270

Change-Id: I09dd146c4479d12ac6bc0e6b47b66937eb29bd42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang
2023-06-15 07:13:11 +00:00
committed by Automerger Merge Worker
parent 235cb64505 3b6f775cd5
commit d698516b69
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/common/java/android/net/NattKeepalivePacketDataTest.kt
View File

@@ -22,6 +22,7 @@ import android.net.NattSocketKeepalive.NATT_PORT
import android.os.Build
import androidx.test.filters.SmallTest
import androidx.test.runner.AndroidJUnit4
import com.android.testutils.ConnectivityModuleTest
import com.android.testutils.DevSdkIgnoreRule
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo
import com.android.testutils.assertEqualBothWays
@@ -85,7 +86,7 @@ class NattKeepalivePacketDataTest {
}
}
@Test @IgnoreUpTo(Build.VERSION_CODES.R)
@Test @IgnoreUpTo(Build.VERSION_CODES.R) @ConnectivityModuleTest
fun testConstructor_afterR() {
// v4 mapped v6 will be translated to a v4 address.
assertFailsWith<InvalidPacketException> {