From 08eca2fa2efc4d8ee0632a5d617cf6479f08ff9f Mon Sep 17 00:00:00 2001 From: vadimt Date: Thu, 12 Dec 2019 18:15:48 -0800 Subject: [PATCH] Removing temporary workarounds to make tests pass on Cuttlefish Bug: 136278866 Change-Id: Ie537a578bb871921c0cbea1f197261e703de98f5 --- .../com/android/launcher3/ui/AbstractLauncherUiTest.java | 2 +- .../com/android/launcher3/tapl/LauncherInstrumentation.java | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index 4243ed041f..779445dd7d 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java @@ -92,7 +92,7 @@ public abstract class AbstractLauncherUiTest { public static final long DEFAULT_ACTIVITY_TIMEOUT = TimeUnit.SECONDS.toMillis(10); public static final long DEFAULT_BROADCAST_TIMEOUT_SECS = 5; - public static final long DEFAULT_UI_TIMEOUT = 60000; // b/136278866 + public static final long DEFAULT_UI_TIMEOUT = 10000; private static final String TAG = "AbstractLauncherUiTest"; protected LooperExecutor mMainThreadExecutor = MAIN_EXECUTOR; diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index 18f33a27de..3483251566 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -429,12 +429,6 @@ public final class LauncherInstrumentation { assertEquals("Unexpected display rotation", mExpectedRotation, mDevice.getDisplayRotation()); - // b/136278866 - for (int i = 0; i != 100; ++i) { - if (getNavigationModeMismatchError() == null) break; - sleep(100); - } - final String error = getNavigationModeMismatchError(); assertTrue(error, error == null); log("verifyContainerType: " + containerType);