| commit | bf63c15d6190af4090a6abd6224002132a13fb99 | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Thu Nov 02 10:58:40 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 02 10:58:40 2023 +0000 |
| tree | 396b7fb9032d6974e6d28d825ad3a99b8a24faee | |
| parent | a3dcccf2b4345eb7d76d28f0bd9a08129a27477a [diff] | |
| parent | 4fd9451cdb23aaa48b96e474793c3dfff4c14a52 [diff] |
Merge "Run CSDestroyedNetworkTests starting in R" into main am: 4fd9451cdb Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2815133 Change-Id: I0b70aca084a4148c3d1bd03936ea54a0e657c750 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() {