| commit | c6a2bb92e3ba50183528e001401765c3dd81cda8 | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Thu Nov 02 11:30:02 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 02 11:30:02 2023 +0000 |
| tree | 8c79301e840636b320dfa557419b0f7fa54be121 | |
| parent | 330d6561008b54565468373e07cde9990d19aecb [diff] | |
| parent | a5a47b210b3a70b5d1e7aef75b0bf676c4ef2869 [diff] |
Merge "Run CSDestroyedNetworkTests starting in R" into main am: 4fd9451cdb am: a5a47b210b Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2815133 Change-Id: I650f7467bc1fc07c3767e3301cc1244b9b4e666a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/unit/java/com/android/server/connectivityservice/CSDestroyedNetworkTests.kt b/tests/unit/java/com/android/server/connectivityservice/CSDestroyedNetworkTests.kt index d40c035..572c7bb 100644 --- a/tests/unit/java/com/android/server/connectivityservice/CSDestroyedNetworkTests.kt +++ b/tests/unit/java/com/android/server/connectivityservice/CSDestroyedNetworkTests.kt
@@ -19,12 +19,20 @@ import android.net.NetworkCapabilities import android.net.NetworkCapabilities.TRANSPORT_WIFI import android.net.NetworkRequest +import android.os.Build +import androidx.test.filters.SmallTest +import com.android.testutils.DevSdkIgnoreRule +import com.android.testutils.DevSdkIgnoreRunner import com.android.testutils.RecorderCallback.CallbackEntry.Lost import com.android.testutils.TestableNetworkCallback import org.junit.Test +import org.junit.runner.RunWith private const val LONG_TIMEOUT_MS = 5_000 +@RunWith(DevSdkIgnoreRunner::class) +@SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) class CSDestroyedNetworkTests : CSTest() { @Test fun testDestroyNetworkNotKeptWhenUnvalidated() {