commit f0a133a2ca0171fdad9a42e71fd824db81f7d603
author Mark Salyzyn <salyzyn@google.com> Sun Oct 15 05:47:40 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sun Oct 15 05:47:40 2017 +0000
tree 0f6eb1dec23f076f2e5f10fccb50132e94de80f0
parent 9d52c1456d4e16a744dda7b7b8223b15a904afdc
parent d0b38c9e1cc7a52ee02bfe6a02c0a8953f9dabf0

Merge "bootstat: test: duration fixes" am: 5126ce99de am: b684bd4e6a am: abaaa9e6a5
am: de010b7238

Change-Id: I81535fbcc8d0a5a7b5365910317c160ca89f322c

bootstat/boot_reason_test.sh

diff --git a/bootstat/boot_reason_test.sh b/bootstat/boot_reason_test.sh
index 7a45e4d..209e81b 100755
--- a/bootstat/boot_reason_test.sh
+++ b/bootstat/boot_reason_test.sh
@@ -70,6 +70,8 @@
     false
   else
     echo "ERROR: '${TEST}' test requires userdebug build, skipping FAILURE"
+    duration_prefix="~"
+    duration_estimate=1
     false
   fi >&2
 }
@@ -130,6 +132,8 @@
       return ${save_ret}
     fi
     echo "ERROR: '${TEST}' test requires functional pstore, skipping FAILURE"
+    duration_prefix="~"
+    duration_estimate=1
   fi >&2
 }
 
@@ -792,7 +796,7 @@
 - adb shell getprop sys.boot.reason
 - NB: should report shutdown,thermal" ]
 test_thermal_shutdown() {
-  durtion_test ">60"
+  duration_test ">60"
   echo "      power on request" >&2
   adb shell setprop sys.powerctl shutdown,thermal
   sleep 5