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

Commit aad77673 authored by Zemiao Zhu's avatar Zemiao Zhu Committed by Automerger Merge Worker
Browse files

Merge "Ignore failing test case in FileCopyUiTest and flaky test in... 

Merge "Ignore failing test case in FileCopyUiTest and flaky test in CancelFromNotificationUiTest." into rvc-dev am: 15420741 am: 924d4f17 am: 3d78adb7 am: d76e69fc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/12092943

Change-Id: I641c97e787936aaf0efb078b29940463d52a44b8
parents fb5f273f d76e69fc

tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java

+3 −4
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ import com.android.documentsui.files.FilesActivity; 
import com.android.documentsui.filters.HugeLongTest;

import com.android.documentsui.services.TestNotificationService;



import org.junit.Ignore;



import java.util.concurrent.CountDownLatch;

import java.util.concurrent.TimeUnit;
@@ -219,8 +217,9 @@ public class CancelFromNotificationUiTest extends ActivityTest<FilesActivity> { 


    @HugeLongTest

    // (TODO: b/156756197) : Deflake tests

    @Ignore

    public void testMoveDocument_CancelFromNotification() throws Exception {

    // Notice because this class inherits JUnit3 TestCase, the right way to suppress a test

    // is by removing "test" from prefix, instead of adding @Ignore.

    public void ignored_testMoveDocument_CancelFromNotification() throws Exception {

        bots.roots.openRoot(ROOT_0_ID);

        bots.directory.findDocument(TARGET_FILE);

        device.waitForIdle();

tests/functional/com/android/documentsui/FileCopyUiTest.java

+8 −2
Original line number Diff line number Diff line
@@ -431,7 +431,10 @@ public class FileCopyUiTest extends ActivityTest<FilesActivity> { 


    // Copy SD Card -> Internal Storage //

    @HugeLongTest

    public void testCopyDocuments_FromSdCard() throws Exception {

    // TODO (b/160649487): excluded in FRC MTS release, and we should add it back later.

    // Notice because this class inherits JUnit3 TestCase, the right way to suppress a test

    // is by removing "test" from prefix, instead of adding @Ignore.

    public void ignored_testCopyDocuments_FromSdCard() throws Exception {

        createDocuments(mSdCardLabel, mSdCardRoot, mStorageDocsHelper);

        copyFiles(mSdCardLabel, mDeviceLabel);
@@ -445,7 +448,10 @@ public class FileCopyUiTest extends ActivityTest<FilesActivity> { 


    // Copy Internal Storage -> SD Card //

    @HugeLongTest

    public void testCopyDocuments_ToSdCard() throws Exception {

    // TODO (b/160649487): excluded in FRC MTS release, and we should add it back later.

    // Notice because this class inherits JUnit3 TestCase, the right way to suppress a test

    // is by removing "test" from prefix, instead of adding @Ignore.

    public void ignored_testCopyDocuments_ToSdCard() throws Exception {

        createDocuments(mDeviceLabel, mPrimaryRoot, mStorageDocsHelper);

        copyFiles(mDeviceLabel, mSdCardLabel);