commit f7cefdb62f7793a03e01ad72ea1760326951b56a
author Mark Salyzyn <salyzyn@google.com> Mon Jun 03 14:43:15 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jun 03 14:43:15 2019 -0700
tree 7d311fc45d35893838e8c56da095ae34cb4984b4
parent 151bd2ad081f7bffc91e2d095d388d329e371df1
parent 53cfe3cab3626f62cc103db8ff7b9948246e9378

Merge "fs_mgr: overlayfs: test: triage data missing after failure flash scratch"
am: b5db741383

Change-Id: I764bf1a863d2b5bc441d7fbf84b8e2715357cb61

fs_mgr/tests/adb-remount-test.sh

diff --git a/fs_mgr/tests/adb-remount-test.sh b/fs_mgr/tests/adb-remount-test.sh
index 4e101c3..0390af3 100755
--- a/fs_mgr/tests/adb-remount-test.sh
+++ b/fs_mgr/tests/adb-remount-test.sh
@@ -51,7 +51,7 @@
 start_time=`date +%s`
 ACTIVE_SLOT=
 
-ADB_WAIT=3m
+ADB_WAIT=4m
 FASTBOOT_WAIT=2m
 
 ##
@@ -1331,7 +1331,7 @@
   echo "${ORANGE}[  WARNING ]${NORMAL} adb after fastboot"
   adb_wait ${ADB_WAIT} ||
     fixup_from_recovery ||
-    die "did not reboot after flash `usb_status`"
+    die "did not reboot after formatting ${scratch_cpartition} `usb_status`"
   if ${overlayfs_needed}; then
     adb_root &&
       D=`adb_sh df -k </dev/null` &&
@@ -1426,7 +1426,7 @@
     die "fastboot flash ${scratch_partition}"
   adb_wait ${ADB_WAIT} &&
     adb_root ||
-    die "did not reboot after flash"
+    die "did not reboot after flashing empty ${scratch_partition} `usb_status`"
   T=`adb_date`
   D=`adb disable-verity 2>&1`
   err=${?}