summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarsten Tausche <karsten@fairphone.com>2018-03-21 16:40:27 +0100
committerKarsten Tausche <karsten@fairphone.com>2018-03-21 16:40:27 +0100
commitaf30baacb71d6ffd2859e274ef69520397e4079a (patch)
tree73dd40b43c46aedc7fc5654b0c76bb6c4dfd9d0e
parent72028bfa1f7e23f31de1b3edf9f03c4ace4e441f (diff)
tradefed.sh: wait for completed boot before disabling suspend
disable_suspend will fail if called on a device that is not completely booted up. This happened in our setup with tradefed.yaml when the device boot process took longer than the lxc environment setup steps, causing tradefed/cts not to be executed in the end. Change-Id: I699cc202fc77d7622f08ffd5094738f0b8ea3622
-rwxr-xr-xautomated/android/tradefed/tradefed.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/automated/android/tradefed/tradefed.sh b/automated/android/tradefed/tradefed.sh
index 112473c..2bcb4da 100755
--- a/automated/android/tradefed/tradefed.sh
+++ b/automated/android/tradefed/tradefed.sh
@@ -44,8 +44,8 @@ if [ -e "/home/testuser" ]; then
export HOME=/home/testuser
fi
-disable_suspend
wait_boot_completed "${TIMEOUT}"
+disable_suspend
# wait_homescreen() searches logcat output for
# 'Displayed com.android.launcher', but the log might be washed away when
# a lot of logs generated after it. When the function not executed in