Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cd2a5dc authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Disable flaky test under Ravenwood." into main

parents 35b770f3 52c9c26a

core/tests/coretests/src/android/os/MessageQueueTest.java

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.os;



import android.platform.test.annotations.IgnoreUnderRavenwood;

import android.platform.test.ravenwood.RavenwoodRule;



import androidx.test.filters.MediumTest;
@@ -153,6 +154,7 @@ public class MessageQueueTest { 


    @Test

    @MediumTest

    @IgnoreUnderRavenwood(reason = "Flaky test, b/315872700")

    public void testFieldIntegrity() throws Exception {



        TestHandlerThread tester = new TestFieldIntegrityHandler() {

core/tests/coretests/src/android/util/SparseSetArrayTest.java

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ public class SparseSetArrayTest { 
    public final RavenwoodRule mRavenwood = new RavenwoodRule();



    @Test

    @IgnoreUnderRavenwood(reason = "Flaky test, b/315872700")

    public void testAddAll() {

        final SparseSetArray<Integer> sparseSetArray = new SparseSetArray<>();

core/tests/utiltests/src/android/util/TimeUtilsTest.java

+10 −0
Original line number Diff line number Diff line
@@ -18,8 +18,12 @@ package android.util; 


import static org.junit.Assert.assertEquals;



import android.platform.test.annotations.IgnoreUnderRavenwood;

import android.platform.test.ravenwood.RavenwoodRule;



import androidx.test.runner.AndroidJUnit4;



import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -29,6 +33,9 @@ import java.util.function.Consumer; 


@RunWith(AndroidJUnit4.class)

public class TimeUtilsTest {

    @Rule

    public final RavenwoodRule mRavenwood = new RavenwoodRule();



    public static final long SECOND_IN_MILLIS = 1000;

    public static final long MINUTE_IN_MILLIS = SECOND_IN_MILLIS * 60;

    public static final long HOUR_IN_MILLIS = MINUTE_IN_MILLIS * 60;
@@ -78,6 +85,7 @@ public class TimeUtilsTest { 
    }



    @Test

    @IgnoreUnderRavenwood(reason = "Flaky test, b/315872700")

    public void testDumpTime() {

        assertEquals("2023-01-01 00:00:00.000", runWithPrintWriter((pw) -> {

            TimeUtils.dumpTime(pw, 1672556400000L);
@@ -91,6 +99,7 @@ public class TimeUtilsTest { 
    }



    @Test

    @IgnoreUnderRavenwood(reason = "Flaky test, b/315872700")

    public void testFormatForLogging() {

        assertEquals("unknown", TimeUtils.formatForLogging(0));

        assertEquals("unknown", TimeUtils.formatForLogging(-1));
@@ -99,6 +108,7 @@ public class TimeUtilsTest { 
    }



    @Test

    @IgnoreUnderRavenwood(reason = "Flaky test, b/315872700")

    public void testLogTimeOfDay() {

        assertEquals("01-01 00:00:00.000", TimeUtils.logTimeOfDay(1672556400000L));

    }