Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change FlakyTest to Ignores" into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-12 16:56:24 +00:00
committed by Android (Google) Code Review
parent d066c0c6cb eefa3be55d
commit 209705d5d7
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java
View File

@@ -40,10 +40,12 @@ import com.android.systemui.utils.hardware.FakeSensorManager;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@SmallTest @SmallTest
@Ignore("failing")
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class DozeTriggersTest extends SysuiTestCase { public class DozeTriggersTest extends SysuiTestCase {
private DozeTriggers mTriggers; private DozeTriggers mTriggers;
@@ -79,7 +81,6 @@ public class DozeTriggersTest extends SysuiTestCase {
}); });
} }
@FlakyTest
@Test @Test
public void testOnNotification_stillWorksAfterOneFailedProxCheck() throws Exception { public void testOnNotification_stillWorksAfterOneFailedProxCheck() throws Exception {
when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE); when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE);

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

@@ -47,7 +47,7 @@ import org.junit.runner.RunWith;
@RunWith(AndroidTestingRunner.class) @RunWith(AndroidTestingRunner.class)
@RunWithLooper @RunWithLooper
@SmallTest @SmallTest
@FlakyTest @Ignore("failing")
public class QSDetailTest extends SysuiTestCase { public class QSDetailTest extends SysuiTestCase {
private MetricsLogger mMetricsLogger; private MetricsLogger mMetricsLogger;

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

@@ -42,7 +42,7 @@ import org.junit.runner.RunWith;
@RunWith(AndroidTestingRunner.class) @RunWith(AndroidTestingRunner.class)
@RunWithLooper @RunWithLooper
@SmallTest @SmallTest
@FlakyTest @Ignore("failing")
public class QSFooterTest extends LeakCheckedTest { public class QSFooterTest extends LeakCheckedTest {
private QSFooter mFooter; private QSFooter mFooter;

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

@@ -52,7 +52,7 @@ import android.widget.FrameLayout;
@RunWith(AndroidTestingRunner.class) @RunWith(AndroidTestingRunner.class)
@RunWithLooper(setAsMainLooper = true) @RunWithLooper(setAsMainLooper = true)
@SmallTest @SmallTest
@FlakyTest @Ignore("failing")
public class QSFragmentTest extends SysuiBaseFragmentTest { public class QSFragmentTest extends SysuiBaseFragmentTest {
private MetricsLogger mMockMetricsLogger; private MetricsLogger mMockMetricsLogger;