Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
James O'Leary
2022-04-22 20:23:12 +00:00
committed by Android (Google) Code Review
parent e06f5b1a31 08df009e8d
commit c10fc9cdd0
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java
View File

@@ -81,7 +81,6 @@ import android.net.Uri;
import android.os.UserHandle; import android.os.UserHandle;
import android.provider.DeviceConfig; import android.provider.DeviceConfig;
import android.service.chooser.ChooserTarget; import android.service.chooser.ChooserTarget;
import android.util.Log;
import android.view.View; import android.view.View;
import androidx.annotation.CallSuper; import androidx.annotation.CallSuper;
@@ -2024,7 +2023,7 @@ public class ChooserActivityTest {
.check(matches(isDisplayed())); .check(matches(isDisplayed()));
} }
@Test @Test @Ignore("b/222124533")
public void testAppTargetLogging() throws InterruptedException { public void testAppTargetLogging() throws InterruptedException {
Intent sendIntent = createSendTextIntent(); Intent sendIntent = createSendTextIntent();
List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2); List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
@@ -2043,6 +2042,10 @@ public class ChooserActivityTest {
mActivityRule.launchActivity(Intent.createChooser(sendIntent, null)); mActivityRule.launchActivity(Intent.createChooser(sendIntent, null));
waitForIdle(); 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)); assertThat(activity.getAdapter().getCount(), is(2));
onView(withIdFromRuntimeResource("profile_button")).check(doesNotExist()); onView(withIdFromRuntimeResource("profile_button")).check(doesNotExist());
@@ -2325,7 +2328,7 @@ public class ChooserActivityTest {
assertThat(logger.numCalls(), is(6)); assertThat(logger.numCalls(), is(6));
} }
@Test @Test @Ignore("b/222124533")
public void testSwitchProfileLogging() throws InterruptedException { public void testSwitchProfileLogging() throws InterruptedException {
// enable the work tab feature flag // enable the work tab feature flag
ResolverActivity.ENABLE_TABBED_VIEW = true; ResolverActivity.ENABLE_TABBED_VIEW = true;