From 7f6baf9f60387ff3ee8c8ee7982edb1cba7a316d Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Fri, 20 Mar 2020 13:25:46 -0700
Subject: [PATCH] [Flake test] add state checks for
 WorkTabTest#testWorkEduIntermittent

Bug: 151768149
Test: labtest
Change-Id: I676175629c60662763b26ce24eba4a361784fbeb
---
 tests/src/com/android/launcher3/ui/WorkTabTest.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java
index db2d97478a..c0d8bfc73d 100644
--- a/tests/src/com/android/launcher3/ui/WorkTabTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java
@@ -16,6 +16,7 @@
 package com.android.launcher3.ui;
 
 import static com.android.launcher3.LauncherState.ALL_APPS;
+import static com.android.launcher3.LauncherState.NORMAL;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -158,9 +159,11 @@ public class WorkTabTest extends AbstractLauncherUiTest {
 
         // dismiss personal edu
         mDevice.pressHome();
+        waitForState("Launcher did not go home", () -> NORMAL);
 
         // open work tab
         executeOnLauncher(launcher -> launcher.getStateManager().goToState(ALL_APPS));
+        waitForState("Launcher did not switch to all apps", () -> ALL_APPS);
         executeOnLauncher(launcher -> {
             AllAppsPagedView pagedView = (AllAppsPagedView) launcher.getAppsView().getContentView();
             pagedView.setCurrentPage(WORK_PAGE);