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

Commit b61f058f authored by Geoffrey Pitsch's avatar Geoffrey Pitsch Committed by Android (Google) Code Review
Browse files

Merge "Change Ignores to FlakyTest so we can check if they're fixed" into oc-dev

parents 7b7e7e16 70950def

packages/SystemUI/tests/src/com/android/systemui/qs/QSDetailTest.java

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static org.mockito.Mockito.mock; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.support.test.filters.FlakyTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;
@@ -44,7 +45,7 @@ import org.junit.runner.RunWith; 


@RunWith(AndroidTestingRunner.class)

@RunWithLooper

@Ignore("flaking")

@FlakyTest

public class QSDetailTest extends SysuiTestCase {



    private MetricsLogger mMetricsLogger;

packages/SystemUI/tests/src/com/android/systemui/qs/QSFooterTest.java

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static org.mockito.Mockito.never; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.support.test.filters.FlakyTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;
@@ -39,7 +40,7 @@ import org.junit.runner.RunWith; 


@RunWith(AndroidTestingRunner.class)

@RunWithLooper

@Ignore("flaking")

@FlakyTest

public class QSFooterTest extends LeakCheckedTest {



    private QSFooter mFooter;

packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static org.mockito.Mockito.mock; 
import android.app.FragmentController;

import android.app.FragmentManagerNonConfig;

import android.os.Looper;

import android.support.test.filters.FlakyTest;



import com.android.internal.logging.MetricsLogger;

import com.android.keyguard.CarrierText;
@@ -49,7 +50,7 @@ import android.widget.FrameLayout; 


@RunWith(AndroidTestingRunner.class)

@RunWithLooper(setAsMainLooper = true)

@Ignore("flaking")

@FlakyTest

public class QSFragmentTest extends SysuiBaseFragmentTest {



    private MetricsLogger mMockMetricsLogger;

packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelTest.java

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import static org.mockito.Mockito.mock; 
import static org.mockito.Mockito.when;

import static org.mockito.Mockito.verify;



import android.support.test.filters.FlakyTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;
@@ -37,7 +38,7 @@ import java.util.Collections; 


@RunWith(AndroidTestingRunner.class)

@RunWithLooper

@Ignore("flaking")

@FlakyTest

public class QSPanelTest extends SysuiTestCase {



    private MetricsLogger mMetricsLogger;

packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static org.mockito.Mockito.mock; 
import android.content.Context;

import android.support.test.InstrumentationRegistry;

import android.support.test.annotation.UiThreadTest;

import android.support.test.filters.FlakyTest;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;

import android.view.View;
@@ -33,7 +34,7 @@ import org.junit.runner.RunWith; 


@SmallTest

@RunWith(AndroidJUnit4.class)

@Ignore("flaking")

@FlakyTest

public class ExpandableNotificationRowTest {



    private Context mContext;