diff options
| author | Jaesung Chung <jaesung@google.com> | 2017-10-21 03:17:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-21 03:17:33 +0000 |
| commit | a33979015a1d987dc51951b7e5303260eecb11d4 (patch) | |
| tree | ea78b83474e108dfcda05f375a0de02d7a65829f | |
| parent | 720941d794fa15ad8cf3ca4c60622e82c8e7e40c (diff) | |
| parent | 07bbd2b7ef9a05d4cb0fafc80ea9e817e0043443 (diff) | |
| download | cts-a33979015a1d987dc51951b7e5303260eecb11d4.tar.gz | |
Merge "CtsViewTestCases: increase timeout" into oc-mr1-dev
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/tests/view/src/android/view/animation/cts/AnimationTest.java b/tests/tests/view/src/android/view/animation/cts/AnimationTest.java index aac14e6cc38..d3bc8e0a127 100644 --- a/tests/tests/view/src/android/view/animation/cts/AnimationTest.java +++ b/tests/tests/view/src/android/view/animation/cts/AnimationTest.java @@ -77,7 +77,7 @@ public class AnimationTest { /** It is defined in R.anim.decelerate_alpha */ private static final int DECELERATE_ALPHA_DURATION = 2000; - private static final int CANCELATION_TIMEOUT = 1000; + private static final int CANCELATION_TIMEOUT = 5000; private Instrumentation mInstrumentation; private Activity mActivity; diff --git a/tests/tests/view/src/android/view/cts/ChoreographerTest.java b/tests/tests/view/src/android/view/cts/ChoreographerTest.java index e152d5b0d8c..a232b511182 100644 --- a/tests/tests/view/src/android/view/cts/ChoreographerTest.java +++ b/tests/tests/view/src/android/view/cts/ChoreographerTest.java @@ -82,7 +82,7 @@ public class ChoreographerTest { // We expect the remaining callbacks to have been invoked once. verify(addedCallback1, timeout(NOMINAL_VSYNC_PERIOD * 10).times(1)).run(); - verify(addedCallback2, times(1)).run(); + verify(addedCallback2, timeout(NOMINAL_VSYNC_PERIOD * 10).times(1)).run(); verifyZeroInteractions(removedCallback); // If we post a callback again, then it should be invoked again. diff --git a/tests/tests/view/src/android/view/cts/PixelCopyViewProducerActivity.java b/tests/tests/view/src/android/view/cts/PixelCopyViewProducerActivity.java index 925dd8e944a..ee1b921090f 100644 --- a/tests/tests/view/src/android/view/cts/PixelCopyViewProducerActivity.java +++ b/tests/tests/view/src/android/view/cts/PixelCopyViewProducerActivity.java @@ -108,7 +108,7 @@ public class PixelCopyViewProducerActivity extends Activity implements OnDrawLis mCurrentOrientation = (mCurrentOrientation + 1) % ORIENTATIONS.length; setRequestedOrientation(ORIENTATIONS[mCurrentOrientation]); }); - waitForFirstDrawCompleted(3, TimeUnit.SECONDS); + waitForFirstDrawCompleted(10, TimeUnit.SECONDS); return mCurrentOrientation != 0; } diff --git a/tests/tests/view/src/android/view/cts/TextureViewCameraTest.java b/tests/tests/view/src/android/view/cts/TextureViewCameraTest.java index b909469308d..63d4d5e8e86 100644 --- a/tests/tests/view/src/android/view/cts/TextureViewCameraTest.java +++ b/tests/tests/view/src/android/view/cts/TextureViewCameraTest.java @@ -31,7 +31,7 @@ import org.junit.runner.RunWith; @LargeTest @RunWith(AndroidJUnit4.class) public class TextureViewCameraTest { - private static final long WAIT_TIMEOUT_IN_SECS = 10; + private static final long WAIT_TIMEOUT_IN_SECS = 30; private TextureViewCameraActivity mActivity; private int mNumberOfCameras; diff --git a/tests/tests/view/src/android/view/cts/TextureViewTest.java b/tests/tests/view/src/android/view/cts/TextureViewTest.java index c771c187819..d9b84a45c43 100644 --- a/tests/tests/view/src/android/view/cts/TextureViewTest.java +++ b/tests/tests/view/src/android/view/cts/TextureViewTest.java @@ -114,7 +114,7 @@ public class TextureViewTest { private int waitForChange(Point point, int color) throws InterruptedException, TimeoutException { - for (int i = 0; i < 20; i++) { + for (int i = 0; i < 30; i++) { int pixel = getPixel(point); if (pixel != color) { return pixel; |