commit 07efd63605d20a3991cf1f21655fe5725b7b8e99
author Doris Liu <tianliu@google.com> Thu Feb 07 02:09:56 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 07 02:09:56 2019 +0000
tree faf605f3b853a0fbc7f80c4355ce1f0cf8117e6d
parent 4ba948c9c1c1438dbe4fc84e010382f2bc3a1006
parent 0dda42b28df1b423b096d9a21c23df61192594fe

Merge "Relax timeouts to deflake"

tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java

diff --git a/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java b/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
index 8650b7a..b0718fe 100644
--- a/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
+++ b/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
@@ -846,7 +846,7 @@
     public void testCachedValues() throws Throwable {
         final AnimTarget target = new AnimTarget();
         final ObjectAnimator anim = ObjectAnimator.ofFloat(target, "testValue", 100);
-        anim.setDuration(200);
+        anim.setDuration(100);
         final CountDownLatch twoFramesLatch = new CountDownLatch(2);
         mActivityRule.runOnUiThread(() -> {
             anim.start();
@@ -865,7 +865,7 @@
         });
 
         assertTrue("Animation didn't start in a reasonable time",
-                twoFramesLatch.await(200, TimeUnit.MILLISECONDS));
+                twoFramesLatch.await(800, TimeUnit.MILLISECONDS));
 
         mActivityRule.runOnUiThread(() -> {
             assertTrue("Start value should readjust to current position",