From 42da924e2a2c6f183f9b42d4ac90daf4fe92bfda Mon Sep 17 00:00:00 2001
From: Oli Lan <olilan@google.com>
Date: Mon, 8 Feb 2021 10:55:07 +0000
Subject: [PATCH] Add FrameworksInProcessTests to presubmit.

This adds tests that run in-process in system server to presubmit.

These are tests that use the new mechanism described at
go/internal-api-testing to instrument the system server.

This CL also changes the in-process tests to use DeviceCleaner
to reboot the device after the tests, rather than using "am restart"
as the previous approach caused subsequent tests to fail.

Bug: 162933947
Test: atest
Change-Id: I1487202b1432a7986b3a0a03b9cfb318d5ec53ae
---
 TEST_MAPPING                                  | 11 +++++++++++
 services/tests/inprocesstests/AndroidTest.xml |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 2b12da291acbb..6c265bc1a3389 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 89abe3c0891c0..b541512fdc9ed 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">