Ubuntu Test Cases

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

  1. simplify-touch
  2. Merge into smoke-touch-apps
Proposed by Andy Doan
Status: Merged
Merged at revision: 80
Proposed branch: lp:~doanac/ubuntu-test-cases/simplify-touch
Merge into: lp:ubuntu-test-cases/smoke-touch-apps
Diff against target: 694 lines (+54/-348)
46 files modified
calendar-app-autopilot/setup.sh (+0/-14)
calendar-app-autopilot/ts_control (+1/-1)
camera-app-autopilot/setup.sh (+0/-14)
camera-app-autopilot/ts_control (+1/-1)
friends-app-autopilot/setup.sh (+0/-14)
friends-app-autopilot/ts_control (+1/-1)
gallery-app-autopilot/setup.sh (+0/-14)
gallery-app-autopilot/ts_control (+1/-1)
jenkins/jenkins.sh (+12/-15)
jenkins/provision.sh (+4/-3)
mediaplayer-app-autopilot/setup.sh (+0/-14)
mediaplayer-app-autopilot/ts_control (+1/-1)
memevent/setup.sh (+0/-14)
memevent/ts_control (+1/-2)
music-app-autopilot/setup.sh (+0/-14)
music-app-autopilot/ts_control (+1/-1)
notes-app-autopilot/setup.sh (+0/-14)
notes-app-autopilot/ts_control (+1/-1)
phone-app-autopilot/setup.sh (+0/-14)
phone-app-autopilot/ts_control (+1/-1)
phone-app-connected-autopilot/setup.sh (+1/-10)
share-app-autopilot/setup.sh (+0/-14)
share-app-autopilot/ts_control (+1/-1)
ubuntu-calculator-app-autopilot/setup.sh (+0/-14)
ubuntu-calculator-app-autopilot/ts_control (+1/-1)
ubuntu-clock-app-autopilot/setup.sh (+0/-14)
ubuntu-clock-app-autopilot/ts_control (+1/-1)
ubuntu-clock-autopilot/master.run (+0/-15)
ubuntu-clock-autopilot/setup.sh (+0/-14)
ubuntu-clock-autopilot/ts_control (+0/-1)
ubuntu-clock-autopilot/tslist.auto (+0/-4)
ubuntu-docviewer-app-autopilot/setup.sh (+0/-14)
ubuntu-docviewer-app-autopilot/ts_control (+1/-1)
ubuntu-filemanager-app-autopilot/setup.sh (+0/-14)
ubuntu-filemanager-app-autopilot/ts_control (+1/-1)
ubuntu-rssreader-app-autopilot/setup.sh (+0/-14)
ubuntu-rssreader-app-autopilot/ts_control (+1/-1)
ubuntu-terminal-app-autopilot/setup.sh (+0/-14)
ubuntu-terminal-app-autopilot/ts_control (+1/-1)
ubuntu-weather-app-autopilot/setup.sh (+0/-14)
ubuntu-weather-app-autopilot/ts_control (+1/-1)
unity8-autopilot/setup.sh (+1/-9)
utils/target/prepare-autopilot-test.sh (+16/-0)
utils/target/unlock_screen.sh (+2/-6)
webbrowser-app-autopilot/setup.sh (+0/-14)
webbrowser-app-autopilot/ts_control (+1/-1)
To merge this branch: bzr merge lp:~doanac/ubuntu-test-cases/simplify-touch
Reviewer Review Type Date Requested Status
Paul Larson Approve
Javier Collado (community) Approve
Review via email: mp+181695@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Javier Collado (javier.collado) wrote :

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
Revision history for this message
Paul Larson (pwlars) wrote :

+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 updated
84. By Andy Doan

fix tabs/spaces in jenkins.sh

Revision history for this message
Andy Doan (doanac) wrote :

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.

Revision history for this message
Paul Larson (pwlars) wrote :

> 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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1#!/bin/sh
2
3set -e
4
5PKGS="autopilot-touch calendar-app-autopilot"
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14/usr/local/bin/unlock_screen.sh
150
=== 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 @@
1ts_setup: sh ./setup.sh1ts_setup: PKGS=calendar-app-autopilot prepare-autopilot-test.sh
22
=== 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 @@
1#!/bin/sh
2
3set -e
4
5PKGS="autopilot-touch camera-app-autopilot"
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14/usr/local/bin/unlock_screen.sh
150
=== 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 @@
1ts_setup: sh ./setup.sh1ts_setup: PKGS=camera-app-autopilot prepare-autopilot-test.sh
22
=== 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 @@
1#!/bin/sh
2
3set -e
4
5PKGS="autopilot-touch friends-app-autopilot"
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14/usr/local/bin/unlock_screen.sh
150
=== 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 @@
1ts_setup: sh ./setup.sh1ts_setup: PKGS=friends-app-autopilot prepare-autopilot-test.sh
22
=== 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 @@
1#!/bin/sh
2
3set -e
4
5PKGS="autopilot-touch gallery-app-autopilot"
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14/usr/local/bin/unlock_screen.sh
150
=== 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 @@
1ts_setup: sh ./setup.sh1ts_setup: PKGS=gallery-app-autopilot prepare-autopilot-test.sh
22
=== 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 @@
33 BUILDID=`cat ${RESDIR}/media-info | awk '{ print $(NF)}' | sed -e 's/(//' -e 's/)//'`33 BUILDID=`cat ${RESDIR}/media-info | awk '{ print $(NF)}' | sed -e 's/(//' -e 's/)//'`
34 echo "= TOUCH BUILD DATE:$BUILDID"34 echo "= TOUCH BUILD DATE:$BUILDID"
3535
36 adb shell "top -n1 -b" > ${RESDIR}/top.log36 adb shell "top -n1 -b" > ${RESDIR}/top.log
3737
38 set -x38 set -x
39 adb shell 'rm -f /var/crash/*'39 adb shell 'rm -f /var/crash/*'
40 if [ -z $QUICK ] ; then40 if [ -z $QUICK ] ; then
41 # get the phone in sane place41 # get the phone in sane place
42 adb -s ${ANDROID_SERIAL} reboot42 adb -s ${ANDROID_SERIAL} reboot
@@ -51,31 +51,28 @@
51 echo "SKIPPING phone reboot..."51 echo "SKIPPING phone reboot..."
52 fi52 fi
5353
54 # push the screen unlocker
55 adb push ${BASEDIR}/unlock_screen/unlock_screen.sh /usr/local/bin
56 adb push ${BASEDIR}/unlock_screen/unlock_screen.py /usr/local/bin
57 # push the runlist over to the test:54 # push the runlist over to the test:
58 adb push ${BASEDIR} ${TESTSUITE_TARGET_BASE} &> /dev/null55 adb push ${BASEDIR} ${TESTSUITE_TARGET_BASE} &> /dev/null
59 ${UTAH_PHABLET_CMD} \56 ${UTAH_PHABLET_CMD} \
60 -s ${ANDROID_SERIAL} \57 -s ${ANDROID_SERIAL} \
61 --results-dir ${RESDIR} \58 --results-dir ${RESDIR} \
62 --skip-install --skip-network --skip-utah \59 --skip-install --skip-network --skip-utah \
63 --pull /var/crash \60 --pull /var/crash \
64 -l ${TESTSUITE_TARGET}/master.run61 -l ${TESTSUITE_TARGET}/master.run
65 adb shell 'rm -f /var/crash/*'62 adb shell 'rm -f /var/crash/*'
6663
67 if ! `grep "^errors: [!0]" < $UTAHFILE >/dev/null` ; then64 if ! `grep "^errors: [!0]" < $UTAHFILE >/dev/null` ; then
68 echo "errors found"65 echo "errors found"
69 EXITCODE=166 EXITCODE=1
70 fi67 fi
71 if ! `grep "^failures: [!0]" < $UTAHFILE >/dev/null` ; then68 if ! `grep "^failures: [!0]" < $UTAHFILE >/dev/null` ; then
72 echo "failures found"69 echo "failures found"
73 EXITCODE=270 EXITCODE=2
74 fi71 fi
75 echo "Results Summary"72 echo "Results Summary"
76 echo "---------------"73 echo "---------------"
77 egrep '^(errors|failures|passes|fetch_errors):' $UTAHFILE74 egrep '^(errors|failures|passes|fetch_errors):' $UTAHFILE
78 exit $EXITCODE75 exit $EXITCODE
79}76}
8077
81trap cleanup TERM INT EXIT78trap cleanup TERM INT EXIT
8279
=== 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 @@
4## Intersting environment variables that must be set:4## Intersting environment variables that must be set:
5## ANDROID_SERIAL - specify another android device5## ANDROID_SERIAL - specify another android device
6## NETWORK_FILE - an alternative network file if you aren't in the lab6## NETWORK_FILE - an alternative network file if you aren't in the lab
7## TOUCH_IMAGE=--ubuntu-bootstrap (provision with read-only system image)
78
8set -e9set -e
9set -x10set -x
@@ -16,10 +17,10 @@
16ANDROID_SERIAL="${ANDROID_SERIAL-015d1884b20c1c0f}" #doanac's nexus7 at home17ANDROID_SERIAL="${ANDROID_SERIAL-015d1884b20c1c0f}" #doanac's nexus7 at home
17NETWORK_FILE="${NETWORK_FILE-/home/ubuntu/magners-wifi}"18NETWORK_FILE="${NETWORK_FILE-/home/ubuntu/magners-wifi}"
1819
19# Image to use for flashing
20# Syntax: TOUCH_IMAGE=--ubuntu-bootstrap
21
22rm -rf clientlogs20rm -rf clientlogs
23mkdir clientlogs21mkdir clientlogs
2422
25${UTAH_PHABLET_CMD} -s ${ANDROID_SERIAL} --results-dir ${RESDIR} --network-file=${NETWORK_FILE} ${TOUCH_IMAGE}23${UTAH_PHABLET_CMD} -s ${ANDROID_SERIAL} --results-dir ${RESDIR} --network-file=${NETWORK_FILE} ${TOUCH_IMAGE}
24
25# get our target-based utilities into our PATH
26adb -s ${ANDROID_SERIAL} push ${BASEDIR}/../utils/target /usr/local/bin/
2627
=== 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 @@
1#!/bin/sh
2
3set -e
4
5PKGS="autopilot-touch mediaplayer-app-autopilot"
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14/usr/local/bin/unlock_screen.sh
150
=== 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 @@
1ts_setup: sh ./setup.sh1ts_setup: PKGS=mediaplayer-app-autopilot prepare-autopilot-test.sh
22
=== 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 @@
1#!/bin/sh
2
3set -e
4
5PKGS="autopilot-touch camera-app-autopilot gallery-app-autopilot mediaplayer-app-autopilot webbrowser-app-autopilot"
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14/usr/local/bin/unlock_screen.sh
150
=== 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 @@
1---1ts_setup: PKGS="camera-app-autopilot gallery-app-autopilot mediaplayer-app-autopilot webbrowser-app-autopilot" prepare-autopilot-test.sh
2ts_setup: ./setup.sh
32
=== 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 @@
1#!/bin/sh
2
3set -e
4
5PKGS="autopilot-touch music-app-autopilot"
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14/usr/local/bin/unlock_screen.sh
150
=== 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 @@
1ts_setup: sh ./setup.sh1ts_setup: PKGS=music-app-autopilot prepare-autopilot-test.sh
22
=== 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 @@
1#!/bin/sh
2
3set -e
4
5PKGS="autopilot-touch notes-app-autopilot"
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14/usr/local/bin/unlock_screen.sh
150
=== 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 @@
1ts_setup: sh ./setup.sh1ts_setup: PKGS=notes-app-autopilot prepare-autopilot-test.sh
22
=== 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 @@
1#!/bin/sh
2
3set -e
4
5PKGS="autopilot-touch phone-app-autopilot"
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14/usr/local/bin/unlock_screen.sh
150
=== 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 @@
1ts_setup: sh ./setup.sh1ts_setup: PKGS=phone-app-autopilot prepare-autopilot-test.sh
22
=== 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 @@
22
3set -e3set -e
44
5PKGS="autopilot-touch phone-app-connected-autopilot"
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14# we have issues with running the test too soon, this is a hack:5# we have issues with running the test too soon, this is a hack:
15echo "SLEEPING 60 TO HELP MAKE SURE PHONE IS READY"6echo "SLEEPING 60 TO HELP MAKE SURE PHONE IS READY"
16sleep 607sleep 60
@@ -26,4 +17,4 @@
26./sms_self.py17./sms_self.py
27sleep 10s # try and let the message come through18sleep 10s # try and let the message come through
2819
29/usr/local/bin/unlock_screen.sh20PKGS="phone-app-connected-autopilot" prepare-autopilot-test.sh
3021
=== 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 @@
1#!/bin/sh
2
3set -e
4
5PKGS="autopilot-touch share-app-autopilot"
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14/usr/local/bin/unlock_screen.sh
150
=== 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 @@
1ts_setup: sh ./setup.sh1ts_setup: PKGS=share-app-autopilot prepare-autopilot-test.sh
22
=== 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 @@
1#!/bin/sh
2
3set -e
4
5PKGS="autopilot-touch ubuntu-calculator-app-autopilot"
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14/usr/local/bin/unlock_screen.sh
150
=== 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 @@
1ts_setup: sh ./setup.sh1ts_setup: PKGS=ubuntu-calculator-app-autopilot prepare-autopilot-test.sh
22
=== 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 @@
1#!/bin/sh
2
3set -e
4
5PKGS="autopilot-touch ubuntu-clock-app-autopilot"
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14/usr/local/bin/unlock_screen.sh
150
=== 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 @@
1ts_setup: sh ./setup.sh1ts_setup: PKGS=ubuntu-clock-app-autopilot prepare-autopilot-test.sh
22
=== 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 @@
1---
2testsuites:
3 - name: settle-before
4 fetch_method: dev
5 fetch_location: ../systemsettle
6 include_tests:
7 - systemsettle-before
8 - name: ubuntu-clock-autopilot
9 fetch_method: dev
10 fetch_location: ./
11 - name: settle-after
12 fetch_method: dev
13 fetch_location: ../systemsettle
14 include_tests:
15 - systemsettle-after
160
=== 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 @@
1#!/bin/sh
2
3set -e
4
5PKGS="autopilot-touch ubuntu-clock-autopilot"
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14/usr/local/bin/unlock_screen.sh
150
=== 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 @@
1ts_setup: sh ./setup.sh
20
=== 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 @@
1-
2 discovery_cmd: "autopilot list ubuntu_clock | grep ubuntu_clock| sed -e 's/^.*ubuntu_clock.tests.//'"
3 test_cmd: utah-autopilot run -v ubuntu_clock.tests.{}
4
50
=== 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 @@
1#!/bin/sh
2
3set -e
4
5PKGS="autopilot-touch ubuntu-docviewer-app-autopilot"
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14/usr/local/bin/unlock_screen.sh
150
=== 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 @@
1ts_setup: sh ./setup.sh1ts_setup: PKGS=ubuntu-docviewer-app-autopilot prepare-autopilot-test.sh
22
=== 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 @@
1#!/bin/sh
2
3set -e
4
5PKGS="autopilot-touch ubuntu-filemanager-app-autopilot"
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14/usr/local/bin/unlock_screen.sh
150
=== 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 @@
1ts_setup: sh ./setup.sh1ts_setup: PKGS=ubuntu-filemanager-app-autopilot prepare-autopilot-test.sh
22
=== 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 @@
1#!/bin/sh
2
3set -e
4
5PKGS="autopilot-touch ubuntu-rssreader-app-autopilot"
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14/usr/local/bin/unlock_screen.sh
150
=== 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 @@
1ts_setup: sh ./setup.sh1ts_setup: PKGS=ubuntu-rssreader-app-autopilot prepare-autopilot-test.sh
22
=== 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 @@
1#!/bin/sh
2
3set -e
4
5PKGS="autopilot-touch ubuntu-terminal-app-autopilot"
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14/usr/local/bin/unlock_screen.sh
150
=== 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 @@
1ts_setup: sh ./setup.sh1ts_setup: PKGS=ubuntu-terminal-app-autopilot prepare-autopilot-test.sh
22
=== 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 @@
1#!/bin/sh
2
3set -e
4
5PKGS="autopilot-touch ubuntu-weather-app-autopilot"
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14/usr/local/bin/unlock_screen.sh
150
=== 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 @@
1ts_setup: sh ./setup.sh1ts_setup: PKGS=ubuntu-weather-app-autopilot prepare-autopilot-test.sh
22
=== 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 @@
22
3set -e3set -e
44
5PKGS="autopilot-touch unity8-autopilot"5NO_UNLOCK=1 PKGS="unity8-autopilot" prepare-autopilot-test.sh
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14sudo -i -u phablet bash -ic "stop unity8"6sudo -i -u phablet bash -ic "stop unity8"
157
=== 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 @@
1#!/bin/sh
2
3set -e
4
5#installs dependencies and unlocks screen so an autopilot test case can run
6
7if [ -n "$PKGS" ] ; then
8 MISSING=0
9 dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
10 if [ $MISSING -eq 1 ] ; then
11 apt-get install -yq --force-yes $PKGS
12 else
13 echo "setup not needed"
14 fi
15fi
16[ -z $NO_UNLOCK ] && unlock_screen.sh
017
=== 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 @@
1#!/bin/sh1#!/bin/sh
22
3#temporary workaround till bug 1190792 is fixed3basedir=$(dirname $(readlink -f $0))
4##Workaround removed for now, because we are trying to settle the system
5##and detect things like this first
6#pkill ueventd
7#sleep 3
84
9#temporary workaround for bug #12073865#temporary workaround for bug #1207386
10chmod 666 /dev/uinput6chmod 666 /dev/uinput
11sudo -i -u phablet bash -ic "PYTHONPATH=$(pwd) /usr/local/bin/unlock_screen.py"7sudo -i -u phablet bash -ic "PYTHONPATH=$(pwd) ${basedir}/unlock_screen.py"
128
=== 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 @@
1#!/bin/sh
2
3set -e
4
5PKGS="autopilot-touch webbrowser-app-autopilot"
6
7MISSING=0
8dpkg -s $PKGS 2>/dev/null >/dev/null || MISSING=1
9if [ $MISSING -eq 1 ] ; then
10 apt-get install -yq --force-yes $PKGS
11else
12 echo "setup not needed"
13fi
14/usr/local/bin/unlock_screen.sh
150
=== 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 @@
1ts_setup: sh ./setup.sh1ts_setup: PKGS=webbrowser-app-autopilot prepare-autopilot-test.sh

Subscribers

People subscribed via source and target branches