Merge "exclude flaky tests for 9.0 R2" into pi-dev am: be9e9dba7b am: e58abeb79d am: 59abe03af9
am: ad1fdd364b
Change-Id: I3d715e7736720be18c0083dea78fe99e512ffa96
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 ' +
diff --git a/nfc/V1_0/target_replay/AndroidTest.xml b/nfc/V1_0/target_replay/AndroidTest.xml
index 03dabbb..3e5f2a3 100644
--- a/nfc/V1_0/target_replay/AndroidTest.xml
+++ b/nfc/V1_0/target_replay/AndroidTest.xml
@@ -30,6 +30,8 @@
<option name="binary-test-type" value="hal_hidl_replay_test"/>
<option name="hal-hidl-replay-test-trace-path" value="test/vts-testcase/hal-trace/nfc/V1_0/android.hardware.nfc_1.0_17270843854.vts.trace"/>
<option name="hal-hidl-replay-test-trace-path" value="test/vts-testcase/hal-trace/nfc/V1_0/android.hardware.nfc_1.0_17261139999.vts.trace"/>
+ <!-- b/80191171 -->
+ <option name="exclude-filter" value="replay_test_android.hardware.nfc_1.0_17261139999.vts.trace" />
<option name="test-timeout" value="15m"/>
</test>
</configuration>
diff --git a/treble/framework_vintf/AndroidTest.xml b/treble/framework_vintf/AndroidTest.xml
index 5cafee2..3824e65 100644
--- a/treble/framework_vintf/AndroidTest.xml
+++ b/treble/framework_vintf/AndroidTest.xml
@@ -16,6 +16,7 @@
<configuration description="Config for CtsOnGsiTrebleFrameworkVintfTest">
<option name="test-suite-tag" value="cts" />
<option name="config-descriptor:metadata" key="component" value="vintf" />
+ <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="push" value="hal-hidl-hash/frameworks/hardware/interfaces/current.txt->/data/local/tmp/frameworks/hardware/interfaces/current.txt"/>
<option name="push" value="hal-hidl-hash/hardware/interfaces/current.txt->/data/local/tmp/hardware/interfaces/current.txt"/>