ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "bootstat: test: add error propagation for fastboot format userdata"

Browse source
This commit is contained in:
Mark Salyzyn 2017-10-27 16:12:11 +00:00 • committed by Gerrit Code Review
commit 7de02203cc
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bootstat/boot_reason_test.sh
View file

@ -241,7 +241,8 @@ EXPECT_EQ() {
[ "USAGE: EXPECT_PROPERTY <prop> <value> [--allow_failure] [ "USAGE: EXPECT_PROPERTY <prop> <value> [--allow_failure]
Returns true if current return (regex) value is true and the result matches" ] Returns true (0) if current return (regex) value is true and the result matches
and the incoming return value is true as well (wired-or)" ]
EXPECT_PROPERTY() { EXPECT_PROPERTY() {
save_ret=${?} save_ret=${?}
property="${1}" property="${1}"
@ -628,8 +629,13 @@ test_optional_factory_reset() {
adb reboot-bootloader adb reboot-bootloader
fi fi
fastboot format userdata >&2 fastboot format userdata >&2
save_ret=${?}
if [ 0 != ${save_ret} ]; then
echo "ERROR: fastboot can not format userdata" >&2
fi
fastboot reboot >&2 fastboot reboot >&2
wait_for_screen wait_for_screen
( exit ${save_ret} ) # because one can not just do ?=${save_ret}
EXPECT_PROPERTY sys.boot.reason reboot,factory_reset EXPECT_PROPERTY sys.boot.reason reboot,factory_reset
EXPECT_PROPERTY persist.sys.boot.reason "" EXPECT_PROPERTY persist.sys.boot.reason ""
report_bootstat_logs reboot,factory_reset bootloader \ report_bootstat_logs reboot,factory_reset bootloader \