diff options
| author | Rishu Sharma <rishus@google.com> | 2022-04-04 17:41:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-04-04 17:41:16 +0000 |
| commit | 5abeb03a64d1f6e517834368ac854f515a265fb9 (patch) | |
| tree | 0110f3f11d8da88aebe98cfa39a7a93c79c961ee | |
| parent | db377a54d823846c792cfa8d8944e4061a4358df (diff) | |
| parent | 27cc68bd19ee4a46063044f713bc3e5196ff0398 (diff) | |
| download | catbox-android13-frc-odp-release.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-devt_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-dev
| -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" /> |