commit f6dc6ac81e9f39dd5c439f6342893cc7cd58f303
author Yin-Chia Yeh <yinchiayeh@google.com> Sun Aug 24 12:40:53 2014 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Sun Aug 24 12:40:53 2014 -0700
tree 7c716f96defd0ea7f6679b2dc3a0298053154b8e
parent ad0c9949c46d943dd7b3f1da2d439c9996bee4b0

Camera: vary timeout by number of results expected

bug 17177260

Change-Id: I0fc0ba57876efec57c013ada399340c520683ee4

tests/tests/hardware/src/android/hardware/camera2/cts/CameraDeviceTest.java

diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraDeviceTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraDeviceTest.java
index 93f8bdd..7f50c5a 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraDeviceTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraDeviceTest.java
@@ -877,9 +877,10 @@
     private void verifyCaptureResults(
             CameraCaptureSession.CaptureListener mockListener,
             int expectResultCount) {
+        final int TIMEOUT_PER_RESULT_MS = 2000;
         // Should receive expected number of capture results.
         verify(mockListener,
-                timeout(CAPTURE_WAIT_TIMEOUT_MS).atLeast(expectResultCount))
+                timeout(TIMEOUT_PER_RESULT_MS * expectResultCount).atLeast(expectResultCount))
                         .onCaptureCompleted(
                                 eq(mSession),
                                 isA(CaptureRequest.class),