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

Commit 5535bbdf authored by Brett Chabot's avatar Brett Chabot
Browse files

Disable flaky and failing tests. 

Bugs 2118268, 2176089
parent a47d1536

tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ public class LifecycleTest extends ActivityTestsBase { 
    }



    //Marking flaky until bug 1164344 is fixed.

    @FlakyTest(tolerance=2)

    @LargeTest

    // @FlakyTest(tolerance=2)

    // @LargeTest

    public void testScreen() throws Exception {

        mIntent = mTopIntent;

        runLaunchpad(LaunchpadActivity.LIFECYCLE_SCREEN);

tests/AndroidTests/src/com/android/unit_tests/os/PerformanceCollectorTest.java

+4 −2
Original line number Diff line number Diff line
@@ -160,7 +160,8 @@ public class PerformanceCollectorTest extends TestCase { 
        verifyTimingBundle(timing, labels);

    }



    @LargeTest

    // TODO: flaky test

    // @LargeTest

    public void testSimpleSequence() throws Exception {

        MockPerformanceResultsWriter writer = new MockPerformanceResultsWriter();

        mPerfCollector.setPerformanceResultsWriter(writer);
@@ -192,7 +193,8 @@ public class PerformanceCollectorTest extends TestCase { 
        verifyTimingBundle(timing, labels);

    }



    @LargeTest

    // TODO: flaky test

    // @LargeTest

    public void testLongSequence() throws Exception {

        MockPerformanceResultsWriter writer = new MockPerformanceResultsWriter();

        mPerfCollector.setPerformanceResultsWriter(writer);

tests/FrameworkTest/tests/src/com/android/frameworktest/focus/ScrollingThroughListOfFocusablesTest.java

+2 −1
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ public class ScrollingThroughListOfFocusablesTest extends InstrumentationTestCas 
        assertEquals(mNumRowsPerItem, mActivity.getNumRowsPerItem());

    }



    @MediumTest

    // TODO: needs to be adjusted to pass on non-HVGA displays

    // @MediumTest

    public void testScrollingDownInFirstItem() throws Exception {



        for (int i = 0; i < mNumRowsPerItem; i++) {

tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchVerticalSpacingStackFromBottomTest.java

+4 −2
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ public class GridTouchVerticalSpacingStackFromBottomTest extends ActivityInstrum 
                newLastChild.getId());

    }

    

    @LargeTest

    // TODO: needs to be adjusted to pass on non-HVGA displays

    // @LargeTest

    public void testShortScroll() {

        View firstChild = mGridView.getChildAt(0);

        if (firstChild.getTop() < this.mGridView.getListPaddingTop()) {
@@ -91,7 +92,8 @@ public class GridTouchVerticalSpacingStackFromBottomTest extends ActivityInstrum 
                newLastChild.getId());

    }

    

    @LargeTest

    // TODO: needs to be adjusted to pass on non-HVGA displays

    // @LargeTest

    public void testLongScroll() {

        View firstChild = mGridView.getChildAt(0);

        if (firstChild.getTop() < mGridView.getListPaddingTop()) {

tests/FrameworkTest/tests/src/com/android/frameworktest/gridview/touch/GridTouchVerticalSpacingTest.java

+4 −2
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ public class GridTouchVerticalSpacingTest extends ActivityInstrumentationTestCas 
        assertEquals("Wrong view in first position", 0, newFirstChild.getId());

    }

    

    @LargeTest

    // TODO: needs to be adjusted to pass on non-HVGA displays

    // @LargeTest

    public void testShortScroll() {

        View firstChild = mGridView.getChildAt(0);

        View lastChild = mGridView.getChildAt(mGridView.getChildCount() - 1);
@@ -83,7 +84,8 @@ public class GridTouchVerticalSpacingTest extends ActivityInstrumentationTestCas 
        assertEquals("Wrong view in first position", 0, newFirstChild.getId());

    }

    

    @LargeTest

    // TODO: needs to be adjusted to pass on non-HVGA displays

    // @LargeTest

    public void testLongScroll() {

        View lastChild = mGridView.getChildAt(mGridView.getChildCount() - 1);