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

Commit ebfde336 authored by Dan Shi's avatar Dan Shi
Browse files

Mark 4 tests as FlakyTest 

Until b/113616538 is fixed, a test class without FlakyTest, can be included in
a presubmit test mapping suite unexpectedly. Mark these 3 classes as FlakyTest
for now:
ActivityManagerServiceTest
AssistDataRequesterTest
AppErrorDialogTest

This test becomes unstable and still needs to be fixed before it can run in
presubmit:
TaskPositioningControllerTests

Bug: 117880789
Test: none
Change-Id: I068d010fa328fa0ec36c8898e21cdf2da7abf0a2
parent a51f6024

services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java

+3 −1
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ import android.os.Process; 
import android.os.RemoteException;

import android.os.SystemClock;



import androidx.test.filters.FlakyTest;

import androidx.test.filters.MediumTest;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;
@@ -102,6 +103,7 @@ import java.util.function.Function; 
 *     com.android.frameworks.servicestests/androidx.test.runner.AndroidJUnitRunner

 */

@SmallTest

@FlakyTest(bugId = 113616538)

@RunWith(AndroidJUnit4.class)

public class ActivityManagerServiceTest {

    private static final String TAG = ActivityManagerServiceTest.class.getSimpleName();

services/tests/servicestests/src/com/android/server/am/AppErrorDialogTest.java

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.Handler; 


import androidx.test.InstrumentationRegistry;

import androidx.test.annotation.UiThreadTest;

import androidx.test.filters.FlakyTest;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;
@@ -37,6 +38,7 @@ import java.io.File; 
 */

@RunWith(AndroidJUnit4.class)

@SmallTest

@FlakyTest(bugId = 113616538)

public class AppErrorDialogTest {



    private Context mContext;

services/tests/servicestests/src/com/android/server/am/AssistDataRequesterTest.java

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.util.Log; 
import android.view.IWindowManager;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.FlakyTest;

import androidx.test.filters.MediumTest;

import androidx.test.runner.AndroidJUnit4;
@@ -67,6 +68,7 @@ import java.util.concurrent.TimeUnit; 
 * runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/am/AssistDataRequesterTest.java

 */

@MediumTest

@FlakyTest(bugId = 113616538)

@RunWith(AndroidJUnit4.class)

public class AssistDataRequesterTest extends ActivityTestsBase {

services/tests/servicestests/src/com/android/server/wm/TaskPositioningControllerTests.java

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import static org.mockito.Mockito.when; 
import android.platform.test.annotations.Presubmit;

import android.view.InputChannel;



import androidx.test.filters.FlakyTest;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;
@@ -43,6 +44,7 @@ import org.junit.runner.RunWith; 
 * atest com.android.server.wm.TaskPositioningControllerTests

 */

@SmallTest

@FlakyTest(bugId = 117924387)

@RunWith(AndroidJUnit4.class)

@Presubmit

public class TaskPositioningControllerTests extends WindowTestsBase {