commit dc8ed36f471c181b770439bfba8007cd49e65a65
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Oct 14 05:50:27 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 14 05:50:27 2024 +0000
tree f57deca4dbffab4f6828b22ff06bcc8bcfca5ce0
parent aeb05239dec71d2fba396b0e30976a3bd375370d
parent 44dfbe67480739c3bdc1aee5b8482db8bccb0da7

Merge "Ignore catalyst test in DisplayScreenTest" into main

tests/robotests/src/com/android/settings/display/DisplayScreenTest.kt

diff --git a/tests/robotests/src/com/android/settings/display/DisplayScreenTest.kt b/tests/robotests/src/com/android/settings/display/DisplayScreenTest.kt
index d869b84..6a7c238 100644
--- a/tests/robotests/src/com/android/settings/display/DisplayScreenTest.kt
+++ b/tests/robotests/src/com/android/settings/display/DisplayScreenTest.kt
@@ -23,6 +23,7 @@
 import com.android.settings.testutils.FakeFeatureFactory
 import com.android.settingslib.preference.CatalystScreenTestCase
 import com.google.common.truth.Truth.assertThat
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers.anyInt
@@ -65,6 +66,7 @@
         assertThat(preferenceScreenCreator.isAvailable(contextWrapper)).isFalse()
     }
 
+    @Ignore("robolectric.createActivityContexts cause other test failure")
     override fun migration() {
         // avoid UnsupportedOperationException when getDisplay from context
         System.setProperty("robolectric.createActivityContexts", "true")