diff options
| -rw-r--r-- | TEST_MAPPING | 11 | ||||
| -rw-r--r-- | services/tests/inprocesstests/AndroidTest.xml | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING index 2b12da291acb..6c265bc1a338 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -51,6 +51,17 @@ "exclude-annotation": "org.junit.Ignore" } ] + }, + { + "name": "FrameworksInProcessTests", + "options": [ + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation": "org.junit.Ignore" + } + ] } ], "postsubmit-managedprofile-stress": [ diff --git a/services/tests/inprocesstests/AndroidTest.xml b/services/tests/inprocesstests/AndroidTest.xml index 89abe3c0891c..b541512fdc9e 100644 --- a/services/tests/inprocesstests/AndroidTest.xml +++ b/services/tests/inprocesstests/AndroidTest.xml @@ -24,8 +24,8 @@ </target_preparer> <!-- Restart to clear test code from system server --> - <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> - <option name="teardown-command" value="am restart" /> + <target_preparer class="com.android.tradefed.targetprep.DeviceCleaner"> + <option name="cleanup-action" value="REBOOT" /> </target_preparer> <test class="com.android.tradefed.testtype.AndroidJUnitTest"> |