Split statsd mts for root/non-root test plans. am: aec8d446ea

Original change: https://googleplex-android-review.googlesource.com/c/platform/test/mts/+/11905059

Change-Id: Ie1a9442c9a1fd484f3eae047f8d025c47a9da446

5 files changed, 40 insertions, 17 deletions

diff --git a/tools/mts-tradefed/res/config/mts-statsd-tests-list.xml b/tools/mts-tradefed/res/config/mts-statsd-tests-list-eng-only.xml
index c8351ec..0712910 100644
--- a/tools/mts-tradefed/res/config/mts-statsd-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-statsd-tests-list-eng-only.xml
@@ -13,17 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="List of statsd MTS tests.">
-
-    <!-- Include tests from CTS -->
-    <option name="compatibility:include-filter" value="CtsStatsdHostTestCases" />
-
-    <!-- Include tests from Statsd Framework Apex -->
-    <option name="compatibility:include-filter" value="FrameworkStatsdTest" />
-
-    <!-- Include tests from GTS -->
-    <option name="compatibility:include-filter" value="GtsStatsdHostTestCases" />
-
+<configuration description="List of statsd MTS tests that need root access.">
     <!-- Include libstats tests -->
     <option name="compatibility:include-filter" value="libstatspull_test" />
     <option name="compatibility:include-filter" value="libstatssocket_test" />
@@ -35,11 +25,8 @@
     <option name="compatibility:include-filter" value="statsd_test" />
 
     <!-- Enable MainlineTestModuleController. -->
-    <option name="compatibility:module-arg" value="CtsStatsdHostTestCases:enable:true" />
-    <option name="compatibility:module-arg" value="FrameworkStatsdTest:enable:true" />
+    <option name="compatibility:module-arg" value="libincident_test:enable:true" />
     <option name="compatibility:module-arg" value="libstatspull_test:enable:true" />
     <option name="compatibility:module-arg" value="libstatssocket_test:enable:true" />
     <option name="compatibility:module-arg" value="statsd_test:enable:true" />
-    <option name="compatibility:module-arg" value="libincident_test:enable:true" />
-
 </configuration>
diff --git a/tools/mts-tradefed/res/config/mts-statsd-tests-list-user.xml b/tools/mts-tradefed/res/config/mts-statsd-tests-list-user.xml
new file mode 100644
index 0000000..7c76a03
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-statsd-tests-list-user.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<configuration description="List of statsd MTS tests that do not need root access.">
+    <!-- Include tests from CTS -->
+    <option name="compatibility:include-filter" value="CtsStatsdHostTestCases" />
+
+    <!-- Include tests from Statsd Framework Apex -->
+    <option name="compatibility:include-filter" value="FrameworkStatsdTest" />
+
+    <!-- Include tests from GTS -->
+    <option name="compatibility:include-filter" value="GtsStatsdHostTestCases" />
+
+    <!-- Enable MainlineTestModuleController. -->
+    <option name="compatibility:module-arg" value="CtsStatsdHostTestCases:enable:true" />
+    <option name="compatibility:module-arg" value="FrameworkStatsdTest:enable:true" />
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-statsd.xml b/tools/mts-tradefed/res/config/mts-statsd.xml
index e9f5219..f0fda7f 100644
--- a/tools/mts-tradefed/res/config/mts-statsd.xml
+++ b/tools/mts-tradefed/res/config/mts-statsd.xml
@@ -17,8 +17,14 @@
 
     <include name="mts" />
 
-    <include name="mts-statsd-tests-list" />
+    <include name="mts-statsd-tests-list-eng-only" />
+    <include name="mts-statsd-tests-list-user" />
 
     <option name="plan" value="mts-statsd" />
 
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.PropertyCheck">
+        <option name="property-name" value="ro.build.type" />
+        <option name="expected-value" value="userdebug"/> <!-- Device should have userdebug/eng build -->
+        <option name="throw-error" value="false"/> <!-- Only print warning if not user build -->
+    </target_preparer>
 </configuration>
diff --git a/tools/mts-tradefed/res/config/mts-tests-list-eng-only.xml b/tools/mts-tradefed/res/config/mts-tests-list-eng-only.xml
index f6a833e..dd9cd94 100644
--- a/tools/mts-tradefed/res/config/mts-tests-list-eng-only.xml
+++ b/tools/mts-tradefed/res/config/mts-tests-list-eng-only.xml
@@ -16,5 +16,6 @@
 <configuration description="List tests that need root access.">
     <include name="mts-dnsresolver-tests-list-eng-only" />
     <include name="mts-adbd-tests-list-eng-only" />
+    <include name="mts-statsd-tests-list-eng-only" />
 </configuration>
 
diff --git a/tools/mts-tradefed/res/config/mts-tests-list-user.xml b/tools/mts-tradefed/res/config/mts-tests-list-user.xml
index 162e304..588beee 100644
--- a/tools/mts-tradefed/res/config/mts-tests-list-user.xml
+++ b/tools/mts-tradefed/res/config/mts-tests-list-user.xml
@@ -25,7 +25,7 @@
     <include name="mts-permission-tests-list" />
     <include name="mts-preload-verify-tests-list" />
     <include name="mts-sdkextensions-tests-list" />
-    <include name="mts-statsd-tests-list" />
+    <include name="mts-statsd-tests-list-user" />
     <include name="mts-tethering-tests-list" />
     <include name="mts-tzdata-tests-list" />
     <include name="mts-wifi-tests-list" />