diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-02-29 17:45:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-29 17:45:29 +0000 |
| commit | b1aa489b0613ed7908e6a53733a36120967dcc5c (patch) | |
| tree | 0694ced95c9f93d4f61fb7cd8f2cfa34715c53f2 | |
| parent | 23c658aa3ad0604cefd0817f417044875a748e0a (diff) | |
| parent | b6fc19c3080d0dc8b9dd34189ef5bbaea7090e01 (diff) | |
| download | core-b1aa489b0613ed7908e6a53733a36120967dcc5c.tar.gz | |
Merge "adb-remount-test: Adb shell command could return 0 or 255 if device is disconnected" into main am: b6fc19c308
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2984453
Change-Id: Ie2d930c3d29e3e6f9c65a979649a7c73b5746329
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | fs_mgr/tests/adb-remount-test.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs_mgr/tests/adb-remount-test.sh b/fs_mgr/tests/adb-remount-test.sh index 7ac7a1642..526c761d3 100755 --- a/fs_mgr/tests/adb-remount-test.sh +++ b/fs_mgr/tests/adb-remount-test.sh @@ -1081,7 +1081,9 @@ LOG OK "no overlay present before setup" LOG RUN "Testing adb disable-verity -R" T=$(adb_date) -adb_su disable-verity -R >&2 || +adb_su disable-verity -R >&2 +err=${?} +[[ ${err} -eq 0 || ${err} -eq 255 ]] || die -t "${T}" "disable-verity -R failed" sleep 2 adb_wait "${ADB_WAIT}" || @@ -1192,7 +1194,9 @@ LOG OK "adb remount from scratch" LOG RUN "Testing adb remount -R" T=$(adb_date) -adb_su remount -R </dev/null >&2 || +adb_su remount -R </dev/null >&2 +err=${?} +[[ ${err} -eq 0 || ${err} -eq 255 ]] || die -t "${T}" "adb remount -R failed" sleep 2 adb_wait "${ADB_WAIT}" || |