summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-10-13 21:08:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-13 21:08:58 +0000
commit6e341fb28a4cecdbe53c5d5cf32c7dea65319125 (patch)
treefd716655fc5dfa6c55c06777a144707822c0f90c
parent7ae36ecda96367e9a07a92503dd5012a0ff63679 (diff)
parentdfd8b3cfeedf16a05df7a938792448e8e7c4a496 (diff)
downloadcts-6e341fb28a4cecdbe53c5d5cf32c7dea65319125.tar.gz
Merge "[ITS] Adding check for test_tol in Zoom test" into android14-tests-dev am: a27d7e3ffb am: dfd8b3cfee
Original change: https://android-review.googlesource.com/c/platform/cts/+/2787139 Change-Id: Ic16f26add29e7fbde705e8e023b63c2684ed9e51 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--apps/CameraITS/tests/scene6/test_zoom.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/CameraITS/tests/scene6/test_zoom.py b/apps/CameraITS/tests/scene6/test_zoom.py
index 2e34320bc5f..2ab5d6f2b19 100644
--- a/apps/CameraITS/tests/scene6/test_zoom.py
+++ b/apps/CameraITS/tests/scene6/test_zoom.py
@@ -124,7 +124,10 @@ class ZoomTest(its_base_test.ItsBaseTest):
# determine radius tolerance of capture
cap_fl = cap['metadata']['android.lens.focalLength']
- radius_tol, offset_tol = test_tols[cap_fl]
+ radius_tol, offset_tol = test_tols.get(
+ cap_fl,
+ (zoom_capture_utils.RADIUS_RTOL, zoom_capture_utils.OFFSET_RTOL)
+ )
# Find the center circle in img
circle = zoom_capture_utils.get_center_circle(img, img_name, size, z,