From 522cc2ff0c2eca5414302ab8262efffb2256f43e Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 26 Mar 2019 17:51:15 -0700
Subject: [PATCH] Adding diags for TAPL flakes that don't reproduce locally

Also temporarily disabling more flaky BindWidgetTests

Change-Id: Ib0d3c54c560ddb49b7964e85bf9cd6ebc567b6d7
---
 tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java | 2 +-
 tests/tapl/com/android/launcher3/tapl/Widgets.java            | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
index fbb4f5115b..68b16d6db5 100644
--- a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
+++ b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
@@ -145,7 +145,7 @@ public class BindWidgetTest extends AbstractLauncherUiTest {
         assertFalse(mDevice.findObject(new UiSelector().description(info.label)).exists());
     }
 
-    @Test
+    @Test @Ignore
     public void testPendingWidget_autoRestored() {
         // A non-restored widget with no config screen gets restored automatically.
         LauncherAppWidgetProviderInfo info = TestViewHelpers.findWidgetProvider(this, false);
diff --git a/tests/tapl/com/android/launcher3/tapl/Widgets.java b/tests/tapl/com/android/launcher3/tapl/Widgets.java
index b6938d6bce..2de53c3f58 100644
--- a/tests/tapl/com/android/launcher3/tapl/Widgets.java
+++ b/tests/tapl/com/android/launcher3/tapl/Widgets.java
@@ -36,6 +36,7 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
     public void flingForward() {
         try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
                 "want to fling forward in widgets")) {
+            LauncherInstrumentation.log("Widgets.flingForward enter");
             final UiObject2 widgetsContainer = verifyActiveContainer();
             widgetsContainer.setGestureMargin(100);
             widgetsContainer.fling(Direction.DOWN,
@@ -43,6 +44,7 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
             try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer("flung forward")) {
                 verifyActiveContainer();
             }
+            LauncherInstrumentation.log("Widgets.flingForward exit");
         }
     }
 
@@ -52,6 +54,7 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
     public void flingBackward() {
         try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
                 "want to fling backwards in widgets")) {
+            LauncherInstrumentation.log("Widgets.flingBackward enter");
             final UiObject2 widgetsContainer = verifyActiveContainer();
             widgetsContainer.setGestureMargin(100);
             widgetsContainer.fling(Direction.UP,
@@ -60,6 +63,7 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
             try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer("flung back")) {
                 verifyActiveContainer();
             }
+            LauncherInstrumentation.log("Widgets.flingBackward exit");
         }
     }