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

Commit 34c661b6 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Ignore some Chooser tests that flake on races." into tm-dev am: c10fc9cd am: 1aea501e am: 540f1fc0" into tm-qpr-dev-plus-aosp
parents b1f0f48c efc925d7
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;