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

Commit 1aea501e authored by James O'Leary's avatar James O'Leary Committed by Automerger Merge Worker
Browse files

Merge "Ignore some Chooser tests that flake on races." into tm-dev am: c10fc9cd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17913999



Change-Id: I82892dc65f0f1c8af5bf3bf79d62ae3be6cf59a6
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0ca9d4e3 c10fc9cd
Loading
Loading
Loading
Loading
+6 −3
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ import android.net.Uri;
import android.os.UserHandle;
import android.provider.DeviceConfig;
import android.service.chooser.ChooserTarget;
import android.util.Log;
import android.view.View;

import androidx.annotation.CallSuper;
@@ -2024,7 +2023,7 @@ public class ChooserActivityTest {
                .check(matches(isDisplayed()));
    }

    @Test
    @Test @Ignore("b/222124533")
    public void testAppTargetLogging() throws InterruptedException {
        Intent sendIntent = createSendTextIntent();
        List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
@@ -2043,6 +2042,10 @@ public class ChooserActivityTest {
                mActivityRule.launchActivity(Intent.createChooser(sendIntent, null));
        waitForIdle();

        // TODO(b/222124533): other test cases use a timeout to make sure that the UI is fully
        // populated; without one, this test flakes. Ideally we should address the need for a
        // timeout everywhere instead of introducing one to fix this particular test.

        assertThat(activity.getAdapter().getCount(), is(2));
        onView(withIdFromRuntimeResource("profile_button")).check(doesNotExist());

@@ -2325,7 +2328,7 @@ public class ChooserActivityTest {
        assertThat(logger.numCalls(), is(6));
    }

    @Test
    @Test @Ignore("b/222124533")
    public void testSwitchProfileLogging() throws InterruptedException {
        // enable the work tab feature flag
        ResolverActivity.ENABLE_TABBED_VIEW = true;