commit a0661541e7ab23d7de2c25c8e5e3d86c72427cc5
author Clemenz Portmann <portmannc@google.com> Tue Oct 19 08:35:11 2021 -0700
committer Clemenz Portmann <portmannc@google.com> Tue Oct 19 12:09:42 2021 -0700
tree bf6d01076032bd41f7f552c97c875ca1ba47874c
parent 4690ad0540974166a3fb26b7089d7cf6786ba967

ITS: test_zoom.py check zoom ratio max, not zoom max

bug: 202466023
Change-Id: Icfe48c04b8dde1ab12ea2c5fc898497ec0e89a81

apps/CameraITS/tests/scene6/test_zoom.py

diff --git a/apps/CameraITS/tests/scene6/test_zoom.py b/apps/CameraITS/tests/scene6/test_zoom.py
index 913f624..4457046 100644
--- a/apps/CameraITS/tests/scene6/test_zoom.py
+++ b/apps/CameraITS/tests/scene6/test_zoom.py
@@ -274,10 +274,12 @@
 
     # assert some range is tested before circles get too big
     zoom_max_thresh = ZOOM_MAX_THRESH
-    if z_max < ZOOM_MAX_THRESH:
-      zoom_max_thresh = z_max
-    test_data_max_z = test_data[max(test_data.keys())]['z']
-    logging.debug('zoom data max: %.2f', test_data_max_z)
+    z_max_ratio = z_max / z_min
+    if z_max_ratio < ZOOM_MAX_THRESH:
+      zoom_max_thresh = z_max_ratio
+    test_data_max_z = (test_data[max(test_data.keys())]['z'] /
+                       test_data[min(test_data.keys())]['z'])
+    logging.debug('test zoom ratio max: %.2f', test_data_max_z)
     if test_data_max_z < zoom_max_thresh:
       raise AssertionError(f'Max zoom ratio tested: {test_data_max_z:.4f}, '
                            f'range advertised min: {z_min}, max: {z_max} '