Merge "Ignore failing tests of com.android.settings.widget" into main

This commit is contained in:
Yanting Yang
2023-12-07 03:52:37 +00:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 0 deletions

View File

@@ -34,6 +34,7 @@ import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
import com.android.settings.testutils.shadow.ShadowUserManager;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
@@ -43,6 +44,7 @@ import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@Ignore("b/315133235")
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {ShadowUserManager.class, ShadowDevicePolicyManager.class})
public class RestrictedButtonTest {

View File

@@ -40,6 +40,7 @@ import com.android.settings.R;
import com.android.settings.testutils.shadow.ShadowSettingsMediaPlayer;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -140,6 +141,7 @@ public class VideoPreferenceTest {
assertThat(mAnimationController.isPlaying()).isTrue();
}
@Ignore("b/315133235")
@Test
@Config(qualifiers = "mcc999")
public void onViewVisible_createAnimationController() {