CameraITS: Update physical camera summary file name tokenizer
Update the physical camera test result file tokenizer from ":" to "."
because MediaProvider treats ":" as invalid character.
Test: python tools/run_all_tests.py camera=0:3 scenes=0
Bug: 160201464
Change-Id: I7a4a0d016b1b42bf98f489af5e7c4d05cb17dde4
diff --git a/apps/CameraITS/tools/run_all_tests.py b/apps/CameraITS/tools/run_all_tests.py
index 36e6b71..49f849e 100644
--- a/apps/CameraITS/tools/run_all_tests.py
+++ b/apps/CameraITS/tools/run_all_tests.py
@@ -517,10 +517,14 @@
results[s] = {result_key: ItsSession.RESULT_NOT_EXECUTED}
camera_fov = calc_camera_fov(id_combo.id, id_combo.sub_id)
+ # Id combo used to store test results in file system
id_combo_string = id_combo.id
+ # Id string used for testing
+ id_test_string = id_combo.id
has_hidden_sub_camera = id_combo.sub_id is not None
if has_hidden_sub_camera:
- id_combo_string += ":" + id_combo.sub_id
+ id_combo_string += "." + id_combo.sub_id
+ id_test_string += ":" + id_combo.sub_id
scenes = [scene for scene in scenes if HIDDEN_PHYSICAL_CAMERA_TESTS[scene]]
# Loop capturing images until user confirm test scene is correct
camera_id_arg = "camera=" + id_combo.id
@@ -643,7 +647,7 @@
test_code = skip_code
if skip_code is not SKIP_RET_CODE:
cmd = ['python', os.path.join(os.getcwd(), testpath)]
- cmd += one_camera_argv + ["camera="+id_combo_string] + [chart_loc_arg]
+ cmd += one_camera_argv + ["camera="+id_test_string] + [chart_loc_arg]
cmd += [chart_dist_arg]
with open(outpath, 'w') as fout, open(errpath, 'w') as ferr:
test_code = run_subprocess_with_timeout(
