Merge "Skip unknown mime types instead of failing" into pi-dev
am: 5ee81f2c4f
Change-Id: I603153bf2cff9ac1682c8cecd6210910963d350e
diff --git a/media/omx/V1_0/host_omxstore/VtsHalMediaOmxStoreV1_0HostTest.py b/media/omx/V1_0/host_omxstore/VtsHalMediaOmxStoreV1_0HostTest.py
index 253d4b7..b54a902 100644
--- a/media/omx/V1_0/host_omxstore/VtsHalMediaOmxStoreV1_0HostTest.py
+++ b/media/omx/V1_0/host_omxstore/VtsHalMediaOmxStoreV1_0HostTest.py
@@ -307,12 +307,14 @@
'Role "' + role_name + '" has duplicates.')
queried_role = get_role(is_encoder, mime_type)
- # type and isEncoder must be known.
- asserts.assertTrue(
- queried_role,
- 'Invalid mime type "' + mime_type + '" for ' +
- ('an encoder.' if is_encoder else 'a decoder.'))
- # type and isEncoder must be consistent with role.
+ # If mime_type is not recognized, skip it.
+ if queried_role is None:
+ logging.info(
+ 'Unrecognized mime type "' +
+ mime_type + '", skipping.')
+ continue
+
+ # Otherwise, type and isEncoder must be consistent with role.
asserts.assertEqual(
role_name, queried_role,
'Role "' + role_name + '" does not match ' +