commit d971cb22c6d32a873ef5cc11d328ff80dab8dad3
author YUKAI HUNG <ykhung@google.com> Thu Jun 10 12:32:18 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 10 12:32:18 2021 +0000
tree 9c1c4eb60d08ddaa7734b8e4491f128ba48db449
parent 2adb28dca2678e40cdea8aecace636b7a6bbc613
parent 394211dd751ba36b8a09488afdf6492eff3a82e2

Merge "Ignore the flaky test in the ConvertUtils first to investigate" into sc-dev am: 394211dd75

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928763

Change-Id: I687efe774f5bbd5334623bcc486ec864f571045a

tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java

diff --git a/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java
index 67a60af..0b1a1e3 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java
@@ -30,6 +30,7 @@
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -316,6 +317,7 @@
             .isEqualTo(entry.mConsumePower * ratio);
     }
 
+    @Ignore
     @Test
     public void testUtcToLocalTime_returnExpectedResult() {
         ConvertUtils.sZoneId = null;
@@ -336,6 +338,7 @@
         assertThat(ConvertUtils.sLocale).isEqualTo(new Locale("en_US"));
     }
 
+    @Ignore
     @Test
     public void testUtcToLocalTimeHour_12HourFormat_returnExpectedResult() {
         ConvertUtils.sZoneIdForHour = null;
@@ -357,6 +360,7 @@
         assertThat(ConvertUtils.sLocaleForHour).isEqualTo(new Locale("en_US"));
     }
 
+    @Ignore
     @Test
     public void testUtcToLocalTimeHour_24HourFormat_returnExpectedResult() {
         ConvertUtils.sZoneIdForHour = null;