Merge lp:~doanac/ubuntu-test-cases/simplify-touch into lp:ubuntu-test-cases/smoke-touch-apps

[Andy Doan]

This is part 1 of a 3 part MP that will get us to where our smoke-touch-apps tests can be run on either the target or from the host. Its mostly just setting up the ground work for the next 2 MPs

[Javier Collado (javier.collado)]

The changes look good and the refactoring of the setup scripts was needed
indeed.

I have a few comments, but they're all related to issues that were already in
the code before this merge request, so I'm just writing them down here to see
what are your thoughts about them:

- Shell scripts arguments
While the scripts are documented and it's clear what environment variables have
to be set to use them, I'd prefer to have arguments, parse them and print the
usage string in case of failure.

- Spaces and tabs mixed
In jenkins.sh it seems that there are some lines that are indented using tabs
and other ones with spaces (and not always the same number of spaces). Being
python my main programming language, I'd prefer to use just 4 spaces per
indentation level.

- adb commands without serial number
Some adb commands don't have a serial number (one of them an adb push in this
merge proposal), neither had the old version of the script, so I guess it
works, but I feel like I'm mising something with regard to what device uses adb
by default.

review: Approve

[Paul Larson (pwlars)]

+1 this all looks good.

Some random comments (nothing that has to be fixed now):
* Yeah, I had noticed that one time about the fact that we use -s on some adb commands and not other. The -s is actually not needed as long as we have ANDROID_SERIAL exported to the environment. If we ever quit doing that, then we need to use the -s though. We should probably be consistent here, but that's a cleanup thing for another time.
* We can actually remove the workaround (which was previously commented out but left in place by me because we didn't know if we would get asked to turn it back on again) for the ueventd bug. That fix went in *today*! \o/

review: Approve

[lp:~doanac/ubuntu-test-cases/simplify-touch]

84. By Andy Doan on 2013-08-23

fix tabs/spaces in jenkins.sh

[Andy Doan (doanac)]

On 08/23/2013 05:58 AM, Javier Collado wrote:
> Review: Approve

> - Shell scripts arguments
> While the scripts are documented and it's clear what environment variables have
> to be set to use them, I'd prefer to have arguments, parse them and print the
> usage string in case of failure.

That's a good point. Given all the changes dependent on this change, I
think we should do this in as a follow-on. It would make things nicer
though.

> - Spaces and tabs mixed
> In jenkins.sh it seems that there are some lines that are indented using tabs
> and other ones with spaces (and not always the same number of spaces). Being
> python my main programming language, I'd prefer to use just 4 spaces per
> indentation level.

I converted to tabs. I hate spaces. Guido is a genius for Python but
evil for spaces :)

> - adb commands without serial number
> Some adb commands don't have a serial number (one of them an adb push in this
> merge proposal), neither had the old version of the script, so I guess it
> works, but I feel like I'm mising something with regard to what device uses adb
> by default.

As Paul said, we should probably just remove the -s $ANDROID_SERIAL as a
follow-on.

[Paul Larson (pwlars)]

> I converted to tabs. I hate spaces. Guido is a genius for Python but
> evil for spaces :)
>
Nooooo! Not tabs, 4 spaces is good and proper. Also, I can give you my vim
rc files that do it automatically and even alert you to pyflakes issues.
I'm being a little pedantic perhaps, but in all seriousness, we should
agree on some coding standards or we'll continue to hit stuff like this

=== removed file 'calendar-app-autopilot/setup.sh'
--- calendar-app-autopilot/setup.sh	2013-08-06 21:59:47 +0000
+++ calendar-app-autopilot/setup.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PKGS="autopilot-touch calendar-app-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
-/usr/local/bin/unlock_screen.sh

=== modified file 'calendar-app-autopilot/ts_control'
--- calendar-app-autopilot/ts_control	2013-08-01 22:15:03 +0000
+++ calendar-app-autopilot/ts_control	2013-08-23 23:40:38 +0000
@@ -1,1 +1,1 @@
-ts_setup: sh ./setup.sh
+ts_setup: PKGS=calendar-app-autopilot prepare-autopilot-test.sh

=== removed file 'camera-app-autopilot/setup.sh'
--- camera-app-autopilot/setup.sh	2013-08-06 21:59:47 +0000
+++ camera-app-autopilot/setup.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PKGS="autopilot-touch camera-app-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
-/usr/local/bin/unlock_screen.sh

=== modified file 'camera-app-autopilot/ts_control'
--- camera-app-autopilot/ts_control	2013-07-10 16:48:31 +0000
+++ camera-app-autopilot/ts_control	2013-08-23 23:40:38 +0000
@@ -1,1 +1,1 @@
-ts_setup: sh ./setup.sh
+ts_setup: PKGS=camera-app-autopilot prepare-autopilot-test.sh

=== removed file 'friends-app-autopilot/setup.sh'
--- friends-app-autopilot/setup.sh	2013-08-06 21:59:47 +0000
+++ friends-app-autopilot/setup.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PKGS="autopilot-touch friends-app-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
-/usr/local/bin/unlock_screen.sh

=== modified file 'friends-app-autopilot/ts_control'
--- friends-app-autopilot/ts_control	2013-07-11 18:39:09 +0000
+++ friends-app-autopilot/ts_control	2013-08-23 23:40:38 +0000
@@ -1,1 +1,1 @@
-ts_setup: sh ./setup.sh
+ts_setup: PKGS=friends-app-autopilot prepare-autopilot-test.sh

=== removed file 'gallery-app-autopilot/setup.sh'
--- gallery-app-autopilot/setup.sh	2013-08-06 21:59:47 +0000
+++ gallery-app-autopilot/setup.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PKGS="autopilot-touch gallery-app-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
-/usr/local/bin/unlock_screen.sh

=== modified file 'gallery-app-autopilot/ts_control'
--- gallery-app-autopilot/ts_control	2013-07-11 19:41:56 +0000
+++ gallery-app-autopilot/ts_control	2013-08-23 23:40:38 +0000
@@ -1,1 +1,1 @@
-ts_setup: sh ./setup.sh
+ts_setup: PKGS=gallery-app-autopilot prepare-autopilot-test.sh

=== modified file 'jenkins/jenkins.sh'
--- jenkins/jenkins.sh	2013-08-16 19:34:15 +0000
+++ jenkins/jenkins.sh	2013-08-23 23:40:38 +0000
@@ -33,10 +33,10 @@
 	BUILDID=`cat ${RESDIR}/media-info | awk '{ print $(NF)}' | sed -e 's/(//' -e 's/)//'`
 	echo "= TOUCH BUILD DATE:$BUILDID"
 
-        adb shell "top -n1 -b" > ${RESDIR}/top.log
+	adb shell "top -n1 -b" > ${RESDIR}/top.log
 
 	set -x
-        adb shell 'rm -f /var/crash/*'
+	adb shell 'rm -f /var/crash/*'
 	if [ -z $QUICK ] ; then
 		# get the phone in sane place
 		adb -s ${ANDROID_SERIAL} reboot
@@ -51,31 +51,28 @@
 		echo "SKIPPING phone reboot..."
 	fi
 
-        # push the screen unlocker
-        adb push ${BASEDIR}/unlock_screen/unlock_screen.sh /usr/local/bin
-        adb push ${BASEDIR}/unlock_screen/unlock_screen.py /usr/local/bin
 	# push the runlist over to the test:
 	adb push ${BASEDIR} ${TESTSUITE_TARGET_BASE} &> /dev/null
 	${UTAH_PHABLET_CMD} \
 		-s ${ANDROID_SERIAL} \
 		--results-dir ${RESDIR} \
 		--skip-install --skip-network --skip-utah \
-                --pull /var/crash \
+		--pull /var/crash \
 		-l ${TESTSUITE_TARGET}/master.run
-        adb shell 'rm -f /var/crash/*'
+	adb shell 'rm -f /var/crash/*'
 
 	if ! `grep "^errors: [!0]" < $UTAHFILE >/dev/null` ; then
-	  echo "errors found"
-	  EXITCODE=1
+		echo "errors found"
+		EXITCODE=1
 	fi
 	if ! `grep "^failures: [!0]" < $UTAHFILE >/dev/null` ; then
-	  echo "failures found"
-	  EXITCODE=2
+		echo "failures found"
+		EXITCODE=2
 	fi
-        echo "Results Summary"
-        echo "---------------"
-        egrep '^(errors|failures|passes|fetch_errors):' $UTAHFILE
-        exit $EXITCODE
+	echo "Results Summary"
+	echo "---------------"
+	egrep '^(errors|failures|passes|fetch_errors):' $UTAHFILE
+	exit $EXITCODE
 }
 
 trap cleanup TERM INT EXIT

=== modified file 'jenkins/provision.sh'
--- jenkins/provision.sh	2013-08-16 16:35:06 +0000
+++ jenkins/provision.sh	2013-08-23 23:40:38 +0000
@@ -4,6 +4,7 @@
 ## Intersting environment variables that must be set:
 ##  ANDROID_SERIAL - specify another android device
 ##  NETWORK_FILE - an alternative network file if you aren't in the lab
+##  TOUCH_IMAGE=--ubuntu-bootstrap   (provision with read-only system image)
 
 set -e
 set -x
@@ -16,10 +17,10 @@
 ANDROID_SERIAL="${ANDROID_SERIAL-015d1884b20c1c0f}"  #doanac's nexus7 at home
 NETWORK_FILE="${NETWORK_FILE-/home/ubuntu/magners-wifi}"
 
-# Image to use for flashing
-# Syntax: TOUCH_IMAGE=--ubuntu-bootstrap
-
 rm -rf clientlogs
 mkdir clientlogs
 
 ${UTAH_PHABLET_CMD} -s ${ANDROID_SERIAL} --results-dir ${RESDIR} --network-file=${NETWORK_FILE} ${TOUCH_IMAGE}
+
+# get our target-based utilities into our PATH
+adb -s ${ANDROID_SERIAL} push ${BASEDIR}/../utils/target /usr/local/bin/

=== removed file 'mediaplayer-app-autopilot/setup.sh'
--- mediaplayer-app-autopilot/setup.sh	2013-08-06 21:59:47 +0000
+++ mediaplayer-app-autopilot/setup.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PKGS="autopilot-touch mediaplayer-app-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
-/usr/local/bin/unlock_screen.sh

=== modified file 'mediaplayer-app-autopilot/ts_control'
--- mediaplayer-app-autopilot/ts_control	2013-07-11 20:00:29 +0000
+++ mediaplayer-app-autopilot/ts_control	2013-08-23 23:40:38 +0000
@@ -1,1 +1,1 @@
-ts_setup: sh ./setup.sh
+ts_setup: PKGS=mediaplayer-app-autopilot prepare-autopilot-test.sh

=== removed file 'memevent/setup.sh'
--- memevent/setup.sh	2013-08-07 16:52:12 +0000
+++ memevent/setup.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PKGS="autopilot-touch camera-app-autopilot gallery-app-autopilot mediaplayer-app-autopilot webbrowser-app-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
-/usr/local/bin/unlock_screen.sh

=== modified file 'memevent/ts_control'
--- memevent/ts_control	2013-08-05 23:23:31 +0000
+++ memevent/ts_control	2013-08-23 23:40:38 +0000
@@ -1,2 +1,1 @@
----
-ts_setup: ./setup.sh
+ts_setup: PKGS="camera-app-autopilot gallery-app-autopilot mediaplayer-app-autopilot webbrowser-app-autopilot" prepare-autopilot-test.sh

=== removed file 'music-app-autopilot/setup.sh'
--- music-app-autopilot/setup.sh	2013-08-06 21:59:47 +0000
+++ music-app-autopilot/setup.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PKGS="autopilot-touch music-app-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
-/usr/local/bin/unlock_screen.sh

=== modified file 'music-app-autopilot/ts_control'
--- music-app-autopilot/ts_control	2013-08-01 22:15:03 +0000
+++ music-app-autopilot/ts_control	2013-08-23 23:40:38 +0000
@@ -1,1 +1,1 @@
-ts_setup: sh ./setup.sh
+ts_setup: PKGS=music-app-autopilot prepare-autopilot-test.sh

=== removed file 'notes-app-autopilot/setup.sh'
--- notes-app-autopilot/setup.sh	2013-08-06 21:59:47 +0000
+++ notes-app-autopilot/setup.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PKGS="autopilot-touch notes-app-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
-/usr/local/bin/unlock_screen.sh

=== modified file 'notes-app-autopilot/ts_control'
--- notes-app-autopilot/ts_control	2013-07-11 20:03:51 +0000
+++ notes-app-autopilot/ts_control	2013-08-23 23:40:38 +0000
@@ -1,1 +1,1 @@
-ts_setup: sh ./setup.sh
+ts_setup: PKGS=notes-app-autopilot prepare-autopilot-test.sh

=== removed file 'phone-app-autopilot/setup.sh'
--- phone-app-autopilot/setup.sh	2013-08-06 21:59:47 +0000
+++ phone-app-autopilot/setup.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PKGS="autopilot-touch phone-app-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
-/usr/local/bin/unlock_screen.sh

=== modified file 'phone-app-autopilot/ts_control'
--- phone-app-autopilot/ts_control	2013-07-11 20:22:43 +0000
+++ phone-app-autopilot/ts_control	2013-08-23 23:40:38 +0000
@@ -1,1 +1,1 @@
-ts_setup: sh ./setup.sh
+ts_setup: PKGS=phone-app-autopilot prepare-autopilot-test.sh

=== modified file 'phone-app-connected-autopilot/setup.sh'
--- phone-app-connected-autopilot/setup.sh	2013-08-16 16:35:06 +0000
+++ phone-app-connected-autopilot/setup.sh	2013-08-23 23:40:38 +0000
@@ -2,15 +2,6 @@
 
 set -e
 
-PKGS="autopilot-touch phone-app-connected-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
 # we have issues with running the test too soon, this is a hack:
 echo "SLEEPING 60 TO HELP MAKE SURE PHONE IS READY"
 sleep 60
@@ -26,4 +17,4 @@
 ./sms_self.py
 sleep 10s  # try and let the message come through
 
-/usr/local/bin/unlock_screen.sh
+PKGS="phone-app-connected-autopilot" prepare-autopilot-test.sh

=== removed file 'share-app-autopilot/setup.sh'
--- share-app-autopilot/setup.sh	2013-08-06 21:59:47 +0000
+++ share-app-autopilot/setup.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PKGS="autopilot-touch share-app-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
-/usr/local/bin/unlock_screen.sh

=== modified file 'share-app-autopilot/ts_control'
--- share-app-autopilot/ts_control	2013-07-10 16:48:31 +0000
+++ share-app-autopilot/ts_control	2013-08-23 23:40:38 +0000
@@ -1,1 +1,1 @@
-ts_setup: sh ./setup.sh
+ts_setup: PKGS=share-app-autopilot prepare-autopilot-test.sh

=== removed file 'ubuntu-calculator-app-autopilot/setup.sh'
--- ubuntu-calculator-app-autopilot/setup.sh	2013-08-06 21:59:47 +0000
+++ ubuntu-calculator-app-autopilot/setup.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PKGS="autopilot-touch ubuntu-calculator-app-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
-/usr/local/bin/unlock_screen.sh

=== modified file 'ubuntu-calculator-app-autopilot/ts_control'
--- ubuntu-calculator-app-autopilot/ts_control	2013-08-01 22:15:03 +0000
+++ ubuntu-calculator-app-autopilot/ts_control	2013-08-23 23:40:38 +0000
@@ -1,1 +1,1 @@
-ts_setup: sh ./setup.sh
+ts_setup: PKGS=ubuntu-calculator-app-autopilot prepare-autopilot-test.sh

=== removed file 'ubuntu-clock-app-autopilot/setup.sh'
--- ubuntu-clock-app-autopilot/setup.sh	2013-08-06 21:59:47 +0000
+++ ubuntu-clock-app-autopilot/setup.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PKGS="autopilot-touch ubuntu-clock-app-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
-/usr/local/bin/unlock_screen.sh

=== modified file 'ubuntu-clock-app-autopilot/ts_control'
--- ubuntu-clock-app-autopilot/ts_control	2013-08-01 22:15:03 +0000
+++ ubuntu-clock-app-autopilot/ts_control	2013-08-23 23:40:38 +0000
@@ -1,1 +1,1 @@
-ts_setup: sh ./setup.sh
+ts_setup: PKGS=ubuntu-clock-app-autopilot prepare-autopilot-test.sh

=== removed directory 'ubuntu-clock-autopilot'
=== removed file 'ubuntu-clock-autopilot/master.run'
--- ubuntu-clock-autopilot/master.run	2013-08-16 19:34:15 +0000
+++ ubuntu-clock-autopilot/master.run	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
----
-testsuites:
-  - name: settle-before
-    fetch_method: dev
-    fetch_location: ../systemsettle
-    include_tests:
-      - systemsettle-before
-  - name: ubuntu-clock-autopilot
-    fetch_method: dev
-    fetch_location: ./
-  - name: settle-after
-    fetch_method: dev
-    fetch_location: ../systemsettle
-    include_tests:
-      - systemsettle-after

=== removed file 'ubuntu-clock-autopilot/setup.sh'
--- ubuntu-clock-autopilot/setup.sh	2013-08-06 21:59:47 +0000
+++ ubuntu-clock-autopilot/setup.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PKGS="autopilot-touch ubuntu-clock-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
-/usr/local/bin/unlock_screen.sh

=== removed file 'ubuntu-clock-autopilot/ts_control'
--- ubuntu-clock-autopilot/ts_control	2013-08-01 22:15:03 +0000
+++ ubuntu-clock-autopilot/ts_control	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-ts_setup: sh ./setup.sh

=== removed file 'ubuntu-clock-autopilot/tslist.auto'
--- ubuntu-clock-autopilot/tslist.auto	2013-08-01 22:15:03 +0000
+++ ubuntu-clock-autopilot/tslist.auto	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
--
-  discovery_cmd: "autopilot list ubuntu_clock | grep ubuntu_clock| sed -e 's/^.*ubuntu_clock.tests.//'"
-  test_cmd: utah-autopilot run -v ubuntu_clock.tests.{}
-

=== removed file 'ubuntu-docviewer-app-autopilot/setup.sh'
--- ubuntu-docviewer-app-autopilot/setup.sh	2013-08-06 21:59:47 +0000
+++ ubuntu-docviewer-app-autopilot/setup.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PKGS="autopilot-touch ubuntu-docviewer-app-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
-/usr/local/bin/unlock_screen.sh

=== modified file 'ubuntu-docviewer-app-autopilot/ts_control'
--- ubuntu-docviewer-app-autopilot/ts_control	2013-08-01 22:15:03 +0000
+++ ubuntu-docviewer-app-autopilot/ts_control	2013-08-23 23:40:38 +0000
@@ -1,1 +1,1 @@
-ts_setup: sh ./setup.sh
+ts_setup: PKGS=ubuntu-docviewer-app-autopilot prepare-autopilot-test.sh

=== removed file 'ubuntu-filemanager-app-autopilot/setup.sh'
--- ubuntu-filemanager-app-autopilot/setup.sh	2013-08-06 21:59:47 +0000
+++ ubuntu-filemanager-app-autopilot/setup.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PKGS="autopilot-touch ubuntu-filemanager-app-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
-/usr/local/bin/unlock_screen.sh

=== modified file 'ubuntu-filemanager-app-autopilot/ts_control'
--- ubuntu-filemanager-app-autopilot/ts_control	2013-08-01 22:15:03 +0000
+++ ubuntu-filemanager-app-autopilot/ts_control	2013-08-23 23:40:38 +0000
@@ -1,1 +1,1 @@
-ts_setup: sh ./setup.sh
+ts_setup: PKGS=ubuntu-filemanager-app-autopilot prepare-autopilot-test.sh

=== removed file 'ubuntu-rssreader-app-autopilot/setup.sh'
--- ubuntu-rssreader-app-autopilot/setup.sh	2013-08-06 21:59:47 +0000
+++ ubuntu-rssreader-app-autopilot/setup.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PKGS="autopilot-touch ubuntu-rssreader-app-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
-/usr/local/bin/unlock_screen.sh

=== modified file 'ubuntu-rssreader-app-autopilot/ts_control'
--- ubuntu-rssreader-app-autopilot/ts_control	2013-08-01 22:15:03 +0000
+++ ubuntu-rssreader-app-autopilot/ts_control	2013-08-23 23:40:38 +0000
@@ -1,1 +1,1 @@
-ts_setup: sh ./setup.sh
+ts_setup: PKGS=ubuntu-rssreader-app-autopilot prepare-autopilot-test.sh

=== removed file 'ubuntu-terminal-app-autopilot/setup.sh'
--- ubuntu-terminal-app-autopilot/setup.sh	2013-08-06 21:59:47 +0000
+++ ubuntu-terminal-app-autopilot/setup.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PKGS="autopilot-touch ubuntu-terminal-app-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
-/usr/local/bin/unlock_screen.sh

=== modified file 'ubuntu-terminal-app-autopilot/ts_control'
--- ubuntu-terminal-app-autopilot/ts_control	2013-08-01 22:15:03 +0000
+++ ubuntu-terminal-app-autopilot/ts_control	2013-08-23 23:40:38 +0000
@@ -1,1 +1,1 @@
-ts_setup: sh ./setup.sh
+ts_setup: PKGS=ubuntu-terminal-app-autopilot prepare-autopilot-test.sh

=== removed file 'ubuntu-weather-app-autopilot/setup.sh'
--- ubuntu-weather-app-autopilot/setup.sh	2013-08-06 21:59:47 +0000
+++ ubuntu-weather-app-autopilot/setup.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PKGS="autopilot-touch ubuntu-weather-app-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
-/usr/local/bin/unlock_screen.sh

=== modified file 'ubuntu-weather-app-autopilot/ts_control'
--- ubuntu-weather-app-autopilot/ts_control	2013-08-01 22:15:03 +0000
+++ ubuntu-weather-app-autopilot/ts_control	2013-08-23 23:40:38 +0000
@@ -1,1 +1,1 @@
-ts_setup: sh ./setup.sh
+ts_setup: PKGS=ubuntu-weather-app-autopilot prepare-autopilot-test.sh

=== modified file 'unity8-autopilot/setup.sh'
--- unity8-autopilot/setup.sh	2013-08-02 20:02:27 +0000
+++ unity8-autopilot/setup.sh	2013-08-23 23:40:38 +0000
@@ -2,13 +2,5 @@
 
 set -e
 
-PKGS="autopilot-touch unity8-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
+NO_UNLOCK=1 PKGS="unity8-autopilot" prepare-autopilot-test.sh
 sudo -i -u phablet bash -ic "stop unity8"

=== added directory 'utils'
=== renamed directory 'unlock_screen' => 'utils/target'
=== added file 'utils/target/prepare-autopilot-test.sh'
--- utils/target/prepare-autopilot-test.sh	1970-01-01 00:00:00 +0000
+++ utils/target/prepare-autopilot-test.sh	2013-08-23 23:40:38 +0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+#installs dependencies and unlocks screen so an autopilot test case can run
+
+if [ -n "$PKGS" ] ; then
+	MISSING=0
+	dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
+	if [ $MISSING -eq 1 ] ; then
+		apt-get install -yq --force-yes $PKGS
+	else
+		echo "setup not needed"
+	fi
+fi
+[ -z $NO_UNLOCK ] && unlock_screen.sh

=== modified file 'utils/target/unlock_screen.sh'
--- unlock_screen/unlock_screen.sh	2013-08-16 19:34:15 +0000
+++ utils/target/unlock_screen.sh	2013-08-23 23:40:38 +0000
@@ -1,11 +1,7 @@
 #!/bin/sh
 
-#temporary workaround till bug 1190792 is fixed
-##Workaround removed for now, because we are trying to settle the system
-##and detect things like this first
-#pkill ueventd
-#sleep 3
+basedir=$(dirname $(readlink -f $0))
 
 #temporary workaround for bug #1207386
 chmod 666 /dev/uinput
-sudo -i -u phablet bash -ic "PYTHONPATH=$(pwd) /usr/local/bin/unlock_screen.py"
+sudo -i -u phablet bash -ic "PYTHONPATH=$(pwd) ${basedir}/unlock_screen.py"

=== removed file 'webbrowser-app-autopilot/setup.sh'
--- webbrowser-app-autopilot/setup.sh	2013-08-06 21:59:47 +0000
+++ webbrowser-app-autopilot/setup.sh	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PKGS="autopilot-touch webbrowser-app-autopilot"
-
-MISSING=0
-dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
-if [ $MISSING -eq 1 ] ; then
-	apt-get install -yq --force-yes $PKGS
-else
-	echo "setup not needed"
-fi
-/usr/local/bin/unlock_screen.sh

=== modified file 'webbrowser-app-autopilot/ts_control'
--- webbrowser-app-autopilot/ts_control	2013-07-11 20:08:44 +0000
+++ webbrowser-app-autopilot/ts_control	2013-08-23 23:40:38 +0000
@@ -1,1 +1,1 @@
-ts_setup: sh ./setup.sh
+ts_setup: PKGS=webbrowser-app-autopilot prepare-autopilot-test.sh