| commit | 01d7d10b6ae81838c912ea9d82389389ada93013 | [log] [tgz] |
|---|---|---|
| author | Marcello Albano <[email protected]> | Fri Apr 07 09:30:44 2023 -0700 |
| committer | Marcello Albano <[email protected]> | Sun Apr 09 00:06:10 2023 +0000 |
| tree | 0c24d279aa2e12f4487e151522d483376277b607 | |
| parent | c455a3d4012ccdc634483e63bfd45a411a3deb31 [diff] |
Disabled profile installer tests for api 34 Disabled for api34: - ProfileVerificationOnGeneratedProfiles - ProfileInstallBroadcastTest Test: n/a Bug: 276970167 Change-Id: I658e047fa6d4643882c9432e597d0a6a8e64638a
diff --git a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/ProfileInstallBroadcastTest.kt b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/ProfileInstallBroadcastTest.kt index 055ccfd..6398e36 100644 --- a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/ProfileInstallBroadcastTest.kt +++ b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/ProfileInstallBroadcastTest.kt
@@ -19,10 +19,13 @@ import android.os.Build import androidx.benchmark.junit4.PerfettoTraceRule import androidx.benchmark.perfetto.ExperimentalPerfettoCaptureApi +import androidx.core.os.BuildCompat import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest import androidx.test.filters.SdkSuppress import kotlin.test.assertNull +import org.junit.Assume +import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -34,6 +37,12 @@ @get:Rule val perfettoTraceRule = PerfettoTraceRule() + @Before + fun setUp() { + // TODO: to re-enable for api 34 (b/276970167) + Assume.assumeTrue(!BuildCompat.isAtLeastU()) + } + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.N) @Test fun installProfile() {
diff --git a/profileinstaller/integration-tests/profile-verification/src/androidTest/java/androidx/profileinstaller/integration/profileverification/ProfileVerificationOnGeneratedProfiles.kt b/profileinstaller/integration-tests/profile-verification/src/androidTest/java/androidx/profileinstaller/integration/profileverification/ProfileVerificationOnGeneratedProfiles.kt index a350bf7..0516ad7 100644 --- a/profileinstaller/integration-tests/profile-verification/src/androidTest/java/androidx/profileinstaller/integration/profileverification/ProfileVerificationOnGeneratedProfiles.kt +++ b/profileinstaller/integration-tests/profile-verification/src/androidTest/java/androidx/profileinstaller/integration/profileverification/ProfileVerificationOnGeneratedProfiles.kt
@@ -54,6 +54,9 @@ @Before fun setUp() { + // TODO: to re-enable for api 34 (b/276970167) + Assume.assumeTrue(!isApi34) + // Note that this test fails on emulator api 30 (b/251540646) Assume.assumeTrue(!isApi30) withPackageName(packageName) { uninstall() }