Merge lp:~psivaa/ubuntu-test-cases/per-test-timeout-autopilot-for-rtm into lp:ubuntu-test-cases/touch

[Para Siva]

Install ppa version of autopilot-1.5 for the rtm images and to enable per-test timeout for all the images.

This is to install ppa version of autopilot-1.5 for rtm images and to enable per-test timeout. The timeout is given to be 180 seconds at the moment.

Tested with rtm (ubuntu-rtm/14.09-proposed) and vivid (devel-proposed) channels. The timeout of 3 min per test seems to be sufficient.

[lp:~psivaa/ubuntu-test-cases/per-test-timeout-autopilot-for-rtm]

340. By Para Siva on 2014-11-06

Format and spaces

[Paul Larson (pwlars)]

We don't actually seem to be having much trouble with this in RTM though do we? vivid results are still pretty incomplete, but RTM is running much better since some of the recent updates. If so, I really don't think we should hack around a problem that isn't present.

In general, I really don't like injecting a PPA into the test process, especially since we are trying to get towards a readonly, adt-run tested system.

[Para Siva (psivaa)]

I think we had hanging issues in rtm a little while ago and it's a matter of time before we see another one. If by chance we see that then it will be on us to rerun the missed tests due to that hang and that process is messy because we need to cherry pick the apps but the hanging one to have the rest of the results.

Also, this ppa injection is only for the rtm though, so this is not changing anything for non-rtm runs.

Unmerged revisions

340. By Para Siva on 2014-11-06

Format and spaces

339. By Para Siva on 2014-11-06

Enable autopilot/1.5 ppa for rtm images and include per test timeout

=== modified file 'scripts/run-autopilot-tests.sh'
--- scripts/run-autopilot-tests.sh	2014-10-16 14:13:12 +0000
+++ scripts/run-autopilot-tests.sh	2014-11-06 12:41:16 +0000
@@ -96,6 +96,7 @@
 		-a /var/crash -a /home/phablet/.cache/upstart \
 		-a /var/log/syslog \
 		-A --timeout-profile=long \
+                -A --test-timeout=180 \
 		-v $app || true
 	adb shell rm -rf /tmp/ci-logs
 	adb shell mkdir /tmp/ci-logs

=== modified file 'utils/host/reboot-and-unlock.sh'
--- utils/host/reboot-and-unlock.sh	2014-08-21 20:18:25 +0000
+++ utils/host/reboot-and-unlock.sh	2014-11-06 12:41:16 +0000
@@ -3,6 +3,12 @@
 
 basedir=$(dirname $(readlink -f $0))
 
+# install ppa version of autopilot for rtm images
+if adb shell system-image-cli -i | grep rtm 2>/dev/null > /dev/null ; then
+    adb shell sudo apt-add-repository -y "deb http://ppa.launchpad.net/autopilot/1.5/ubuntu utopic main"
+    adb shell sudo apt-get update
+fi
+
 if ! adb-shell dpkg -s unity8-autopilot 2>/dev/null >/dev/null ; then
 	echo "Installing unity8-autopilot as a pre-req for unlocking screen"
 	adb shell sudo apt-get install -yq --force-yes unity8-autopilot