diff options
author | Rishu Sharma <rishus@google.com> | 2022-04-04 18:02:30 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-04 18:02:30 +0000 |
commit | 55cd53583c929a94ef69143b6249c36cf8ce4292 (patch) | |
tree | 0110f3f11d8da88aebe98cfa39a7a93c79c961ee | |
parent | 7842435e7c758c0ae4da4a2ccb5229073fbf8112 (diff) | |
parent | 5abeb03a64d1f6e517834368ac854f515a265fb9 (diff) | |
download | catbox-aml_tz4_332714010.tar.gz |
Merge "Update CATBox multi-user test plan - 1. Remove flaky test DeleteLastAdminUser 2. Replace `fw.stop_bg_users_on_switch` usage by proper API - set-stop-user-on-switch false" into tm-dev am: 5abeb03a64aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseaml_tz4_332714010
Original change: https://googleplex-android-review.googlesource.com/c/platform/test/catbox/+/17546155
Change-Id: I5ac69f9597bcd2d33f37294e6fd33c5505bac36a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | tools/catbox-tradefed/res/config/catbox-functional-multiuser-system-user.xml | 4 | ||||
-rw-r--r-- | tools/catbox-tradefed/res/config/catbox-functional-multiuser.xml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/catbox-tradefed/res/config/catbox-functional-multiuser-system-user.xml b/tools/catbox-tradefed/res/config/catbox-functional-multiuser-system-user.xml index 3eb46e3..b214a80 100644 --- a/tools/catbox-tradefed/res/config/catbox-functional-multiuser-system-user.xml +++ b/tools/catbox-tradefed/res/config/catbox-functional-multiuser-system-user.xml @@ -34,5 +34,7 @@ <!-- Tests --> <option name="compatibility:include-filter" value="AndroidAutomotiveMultiuserTests android.platform.tests.DeleteCurrentNonAdminUser" /> <option name="compatibility:include-filter" value="AndroidAutomotiveMultiuserTests android.platform.tests.SwitchToGuestFromNonAdmin" /> +<!-- <option name="compatibility:include-filter" value="AndroidAutomotiveMultiuserTests android.platform.tests.DeleteLastAdminUser" /> -</configuration> +--> +</configuration>
\ No newline at end of file diff --git a/tools/catbox-tradefed/res/config/catbox-functional-multiuser.xml b/tools/catbox-tradefed/res/config/catbox-functional-multiuser.xml index 921e626..a3d0d0e 100644 --- a/tools/catbox-tradefed/res/config/catbox-functional-multiuser.xml +++ b/tools/catbox-tradefed/res/config/catbox-functional-multiuser.xml @@ -24,7 +24,7 @@ <option name="plan" value="catbox-functional-multiuser"/> <!-- adb shell command specific to multiuser tests --> - <option name="run-command:run-command" value="setprop fw.stop_bg_users_on_switch 0" /> + <option name="run-command:run-command" value="cmd activity set-stop-user-on-switch false" /> <!-- Test Args --> <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:runner:androidx.test.runner.AndroidJUnitRunner" /> |