commit d0b38c9e1cc7a52ee02bfe6a02c0a8953f9dabf0
author Mark Salyzyn <salyzyn@google.com> Sun Oct 15 04:36:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sun Oct 15 04:36:30 2017 +0000
tree 7913c78767f884a8cd90c0a6f4bc68cebc429ca7
parent ea5ce6fbfb5655cd1755227322bffc24833b014f
parent 59131e7429c8cefe3b7c032a4cb67691e35b7cfc

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

Change-Id: I8f9ad48f6cbe3593aab96af4277775f4d7ceacff

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