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

Commit 4c8f3281 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ignore flaky test" into tm-qpr-dev am: 0c7129a0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21603190



Change-Id: I21733b589e8592f29fb0e44d3b88833739f399b2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1bd6be98 0c7129a0

android/app/tests/unit/src/com/android/bluetooth/opp/BluetoothOppTransferHistoryTest.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ import com.google.common.base.Objects; 




import org.junit.After;

import org.junit.After;

import org.junit.Before;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.Mock;
@@ -166,6 +167,7 @@ public class BluetoothOppTransferHistoryTest { 
                matches(isDisplayed()));

                matches(isDisplayed()));

    }

    }





    @Ignore("b/268424815")

    @Test

    @Test

    public void onOptionsItemSelected_clearAllSelected_promptWarning() {

    public void onOptionsItemSelected_clearAllSelected_promptWarning() {

        BluetoothOppTestUtils.setUpMockCursor(mCursor, mCursorMockDataList);

        BluetoothOppTestUtils.setUpMockCursor(mCursor, mCursorMockDataList);