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

[Andy Doan]

this moves the tests over to using some common scripts to do all their heavy lifting. with this in place, the next step is to provide equivalent scripts that can run from the host.

[Javier Collado (javier.collado)]

The code looks fine.

I have a couple of comments, though:

- Default values

Instead of this approach to define default values:

app=$1
pat=$app
rep=$app.tests.

...

[ -z "$2" ] || pat=$2
[ -z "$3" ] || rep=$3

I think it's more common to use this one:

app=$1
pat=${2:-$app}
rep=${3:-$app.tests.}

- utah-autopilot

This branch replaces utah-autopilot with autopilot-run and this introduces some
duplication. I believe that either autopilot-run should be in utah or
utah-autopilot should be removed from utah.

[Paul Larson (pwlars)]

106 - discovery_cmd: "utah-autopilot list connected_tests | grep connected_tests.tests.test_communication_panel | sed -e 's/^.*connected_tests.tests.//'"
107 - test_cmd: utah-autopilot run -v connected_tests.tests.{}
108 + discovery_cmd: autopilot-list connected_tests connected_tests.tests.test_communication_panel
Shouldn't that be:
discovery_cmd: autopilot-list connected_tests.tests.test_communication_panel connected_tests.tests.

Otherwise, +1 from me

review: Approve

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

88. By Andy Doan on 2013-08-23

improve variable handling

as per javier

[Andy Doan (doanac)]

On 08/23/2013 06:29 AM, Javier Collado wrote:

> I think it's more common to use this one:
>
> app=$1
> pat=${2:-$app}
> rep=${3:-$app.tests.}

good suggestion. done.

>
> - utah-autopilot
>
> This branch replaces utah-autopilot with autopilot-run and this introduces some
> duplication. I believe that either autopilot-run should be in utah or
> utah-autopilot should be removed from utah.

true, but we can't delete this from utah until this change has been put
in place.

[Andy Doan (doanac)]

On 08/23/2013 04:46 PM, Paul Larson wrote:
> Shouldn't that be:
> discovery_cmd: autopilot-list connected_tests.tests.test_communication_panel connected_tests.tests.

good catch. not sure how that got past my testing.

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

89. By Andy Doan on 2013-08-24

fix discovery for connected test

as per paul

=== modified file 'calendar-app-autopilot/tslist.auto'
--- calendar-app-autopilot/tslist.auto	2013-08-01 22:15:03 +0000
+++ calendar-app-autopilot/tslist.auto	2013-08-24 00:12:29 +0000
@@ -1,4 +1,4 @@
 -
-  discovery_cmd: "autopilot list calendar_app | grep calendar_app| sed -e 's/^.*calendar_app.tests.//'"
-  test_cmd: utah-autopilot run -v calendar_app.tests.{}
+  discovery_cmd: autopilot-list calendar_app
+  test_cmd: autopilot-run calendar_app.tests.{}
 

=== modified file 'camera-app-autopilot/tslist.auto'
--- camera-app-autopilot/tslist.auto	2013-07-22 22:27:03 +0000
+++ camera-app-autopilot/tslist.auto	2013-08-24 00:12:29 +0000
@@ -1,4 +1,4 @@
 -
-  discovery_cmd: "autopilot list camera_app | grep camera_app | sed -e 's/^.*camera_app.tests.//'"
-  test_cmd: utah-autopilot run -v camera_app.tests.{}
+  discovery_cmd: autopilot-list camera_app
+  test_cmd: autopilot-run camera_app.tests.{}
 

=== modified file 'friends-app-autopilot/tslist.auto'
--- friends-app-autopilot/tslist.auto	2013-07-22 22:27:03 +0000
+++ friends-app-autopilot/tslist.auto	2013-08-24 00:12:29 +0000
@@ -1,4 +1,4 @@
 -
-  discovery_cmd: "autopilot list friends_app | grep friends_app | sed -e 's/^.*friends_app.tests.//'"
-  test_cmd: utah-autopilot run -v friends_app.tests.{}
+  discovery_cmd: autopilot-list friends_app
+  test_cmd: autopilot-run friends_app.tests.{}
 

=== modified file 'gallery-app-autopilot/tslist.auto'
--- gallery-app-autopilot/tslist.auto	2013-07-22 22:27:03 +0000
+++ gallery-app-autopilot/tslist.auto	2013-08-24 00:12:29 +0000
@@ -1,4 +1,4 @@
 -
-  discovery_cmd: "autopilot list gallery_app | grep gallery_app | sed -e 's/^.*gallery_app.tests.//'"
-  test_cmd: utah-autopilot run -v gallery_app.tests.{}
+  discovery_cmd: autopilot-list gallery_app
+  test_cmd: autopilot-run gallery_app.tests.{}
 

=== modified file 'mediaplayer-app-autopilot/tslist.auto'
--- mediaplayer-app-autopilot/tslist.auto	2013-07-22 22:27:03 +0000
+++ mediaplayer-app-autopilot/tslist.auto	2013-08-24 00:12:29 +0000
@@ -1,4 +1,4 @@
 -
-  discovery_cmd: "autopilot list mediaplayer_app | grep mediaplayer_app | sed -e 's/^.*mediaplayer_app.tests.//'"
-  test_cmd: utah-autopilot run -v mediaplayer_app.tests.{}
+  discovery_cmd: autopilot-list mediaplayer_app
+  test_cmd: autopilot-run mediaplayer_app.tests.{}
 

=== modified file 'memevent/tslist.auto'
--- memevent/tslist.auto	2013-08-05 23:23:31 +0000
+++ memevent/tslist.auto	2013-08-24 00:12:29 +0000
@@ -3,5 +3,5 @@
 # The test command is run from a sub directory in that
 # We need to run each command in the directory that contains ubuntu_test_cases
 # so that autopilot can find our python modules
-- discovery_cmd: cd memevent; autopilot list ubuntu_test_cases.memory_usage_measurement | grep memory_usage_measurement | sed -e 's/.*\.tests\.//'
-  test_cmd: cd ..; utah-autopilot run -v ubuntu_test_cases.memory_usage_measurement.tests.{}
+- discovery_cmd: cd memevent; autopilot-list ubuntu_test_cases.memory_usage_measurement
+  test_cmd: cd ..; autopilot-run ubuntu_test_cases.memory_usage_measurement.tests.{}

=== modified file 'music-app-autopilot/tslist.auto'
--- music-app-autopilot/tslist.auto	2013-08-01 22:15:03 +0000
+++ music-app-autopilot/tslist.auto	2013-08-24 00:12:29 +0000
@@ -1,4 +1,4 @@
 -
-  discovery_cmd: "autopilot list music_app | grep music_app| sed -e 's/^.*music_app.tests.//'"
-  test_cmd: utah-autopilot run -v music_app.tests.{}
+  discovery_cmd: autopilot-list music_app
+  test_cmd: autopilot-run music_app.tests.{}
 

=== modified file 'notes-app-autopilot/tslist.auto'
--- notes-app-autopilot/tslist.auto	2013-07-22 22:27:03 +0000
+++ notes-app-autopilot/tslist.auto	2013-08-24 00:12:29 +0000
@@ -1,4 +1,4 @@
 -
-  discovery_cmd: "autopilot list notes_app | grep notes_app | sed -e 's/^.*notes_app.tests.//'"
-  test_cmd: utah-autopilot run -v notes_app.tests.{}
+  discovery_cmd: autopilot-list notes_app
+  test_cmd: autopilot-run notes_app.tests.{}
 

=== modified file 'phone-app-autopilot/tslist.auto'
--- phone-app-autopilot/tslist.auto	2013-07-22 22:27:03 +0000
+++ phone-app-autopilot/tslist.auto	2013-08-24 00:12:29 +0000
@@ -1,4 +1,4 @@
 -
-  discovery_cmd: "autopilot list phone_app | grep phone_app | sed -e 's/^.*phone_app.tests.//'"
-  test_cmd: utah-autopilot run -v phone_app.tests.{}
+  discovery_cmd: autopilot-list phone_app
+  test_cmd: autopilot-run phone_app.tests.{}
 

=== modified file 'phone-app-connected-autopilot/tslist.auto'
--- phone-app-connected-autopilot/tslist.auto	2013-08-16 16:35:06 +0000
+++ phone-app-connected-autopilot/tslist.auto	2013-08-24 00:12:29 +0000
@@ -1,4 +1,4 @@
 -
-  discovery_cmd: "utah-autopilot list connected_tests | grep connected_tests.tests.test_communication_panel | sed -e 's/^.*connected_tests.tests.//'"
-  test_cmd: utah-autopilot run -v connected_tests.tests.{}
+  discovery_cmd: autopilot-list connected_tests test_communication_panel
+  test_cmd: autopilot-run connected_tests.tests.{}
 

=== modified file 'share-app-autopilot/tslist.auto'
--- share-app-autopilot/tslist.auto	2013-07-22 22:27:03 +0000
+++ share-app-autopilot/tslist.auto	2013-08-24 00:12:29 +0000
@@ -1,4 +1,4 @@
 -
-  discovery_cmd: "autopilot list share_app | grep share_app | sed -e 's/^.*share_app.tests.//'"
-  test_cmd: utah-autopilot run -v share_app.tests.{}
+  discovery_cmd: autopilot-list share_app
+  test_cmd: autopilot-run share_app.tests.{}
 

=== modified file 'ubuntu-calculator-app-autopilot/tslist.auto'
--- ubuntu-calculator-app-autopilot/tslist.auto	2013-08-07 19:33:41 +0000
+++ ubuntu-calculator-app-autopilot/tslist.auto	2013-08-24 00:12:29 +0000
@@ -1,4 +1,4 @@
 -
-  discovery_cmd: "autopilot list ubuntu_calculator_app | grep ubuntu_calculator_app | sed -e 's/^.*ubuntu_calculator_app.tests.//'"
-  test_cmd: utah-autopilot run -v ubuntu_calculator_app.tests.{}
+  discovery_cmd: autopilot-list ubuntu_calculator_app
+  test_cmd: autopilot-run ubuntu_calculator_app.tests.{}
 

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

=== modified file 'ubuntu-docviewer-app-autopilot/tslist.auto'
--- ubuntu-docviewer-app-autopilot/tslist.auto	2013-08-01 22:15:03 +0000
+++ ubuntu-docviewer-app-autopilot/tslist.auto	2013-08-24 00:12:29 +0000
@@ -1,4 +1,4 @@
 -
-  discovery_cmd: "autopilot list ubuntu_docviewer_app | grep ubuntu_docviewer_app| sed -e 's/^.*ubuntu_docviewer_app.tests.//'"
-  test_cmd: utah-autopilot run -v ubuntu_docviewer_app.tests.{}
+  discovery_cmd: autopilot-list ubuntu_docviewer_app
+  test_cmd: autopilot-run ubuntu_docviewer_app.tests.{}
 

=== modified file 'ubuntu-filemanager-app-autopilot/tslist.auto'
--- ubuntu-filemanager-app-autopilot/tslist.auto	2013-08-01 22:15:03 +0000
+++ ubuntu-filemanager-app-autopilot/tslist.auto	2013-08-24 00:12:29 +0000
@@ -1,4 +1,4 @@
 -
-  discovery_cmd: "autopilot list ubuntu_filemanager_app | grep ubuntu_filemanager_app| sed -e 's/^.*ubuntu_filemanager_app.tests.//'"
-  test_cmd: utah-autopilot run -v ubuntu_filemanager_app.tests.{}
+  discovery_cmd: autopilot-list ubuntu_filemanager_app
+  test_cmd: autopilot-run ubuntu_filemanager_app.tests.{}
 

=== modified file 'ubuntu-rssreader-app-autopilot/tslist.auto'
--- ubuntu-rssreader-app-autopilot/tslist.auto	2013-08-01 22:15:03 +0000
+++ ubuntu-rssreader-app-autopilot/tslist.auto	2013-08-24 00:12:29 +0000
@@ -1,4 +1,4 @@
 -
-  discovery_cmd: "autopilot list ubuntu_rssreader_app | grep ubuntu_rssreader_app| sed -e 's/^.*ubuntu_rssreader_app.tests.//'"
-  test_cmd: utah-autopilot run -v ubuntu_rssreader_app.tests.{}
+  discovery_cmd: autopilot-list ubuntu_rssreader_app
+  test_cmd: autopilot-run ubuntu_rssreader_app.tests.{}
 

=== modified file 'ubuntu-terminal-app-autopilot/tslist.auto'
--- ubuntu-terminal-app-autopilot/tslist.auto	2013-08-01 22:15:03 +0000
+++ ubuntu-terminal-app-autopilot/tslist.auto	2013-08-24 00:12:29 +0000
@@ -1,4 +1,4 @@
 -
-  discovery_cmd: "autopilot list ubuntu_terminal_app | grep ubuntu_terminal_app| sed -e 's/^.*ubuntu_terminal_app.tests.//'"
-  test_cmd: utah-autopilot run -v ubuntu_terminal_app.tests.{}
+  discovery_cmd: autopilot-list ubuntu_terminal_app
+  test_cmd: autopilot-run ubuntu_terminal_app.tests.{}
 

=== modified file 'ubuntu-weather-app-autopilot/tslist.auto'
--- ubuntu-weather-app-autopilot/tslist.auto	2013-08-01 22:15:03 +0000
+++ ubuntu-weather-app-autopilot/tslist.auto	2013-08-24 00:12:29 +0000
@@ -1,4 +1,4 @@
 -
-  discovery_cmd: "autopilot list ubuntu_weather_app | grep ubuntu_weather_app | sed -e 's/^.*ubuntu_weather_app.tests.//'"
-  test_cmd: utah-autopilot run -v ubuntu_weather_app.tests.{}
+  discovery_cmd: autopilot-list ubuntu_weather_app
+  test_cmd: autopilot-run ubuntu_weather_app.tests.{}
 

=== modified file 'unity8-autopilot/tslist.auto'
--- unity8-autopilot/tslist.auto	2013-08-07 13:53:43 +0000
+++ unity8-autopilot/tslist.auto	2013-08-24 00:12:29 +0000
@@ -1,4 +1,4 @@
 -
-  discovery_cmd: "autopilot list unity8 | grep unity8 | sed -e 's/^.*unity8.//'"
-  test_cmd: utah-autopilot run -v unity8.{}
+  discovery_cmd: autopilot-list unity8 unity8 unity8.
+  test_cmd: autopilot-run unity8.{}
 

=== added file 'utils/target/autopilot-list'
--- utils/target/autopilot-list	1970-01-01 00:00:00 +0000
+++ utils/target/autopilot-list	2013-08-24 00:12:29 +0000
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+app=$1
+pat=${2:-$app}
+rep=${3:-$app.tests.}
+
+if [ -z "$app" ] ; then
+	echo "USAGE: $0 <app> [pattern] [replace]"
+	exit 1
+fi
+
+curdir=$(pwd)
+sudo -i -u phablet bash -ic "PYTHONPATH=$curdir autopilot list $app" | grep $pat | sed -e "s/^.*${rep}//"

=== added file 'utils/target/autopilot-run'
--- utils/target/autopilot-run	1970-01-01 00:00:00 +0000
+++ utils/target/autopilot-run	2013-08-24 00:12:29 +0000
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+curdir=$(pwd)
+sudo -i -u phablet bash -ic "PYTHONPATH=$curdir autopilot run -v $*"

=== modified file 'utils/target/prepare-autopilot-test.sh'
--- utils/target/prepare-autopilot-test.sh	2013-08-24 00:12:29 +0000
+++ utils/target/prepare-autopilot-test.sh	2013-08-24 00:12:29 +0000
@@ -14,3 +14,4 @@
 	fi
 fi
 [ -z $NO_UNLOCK ] && unlock_screen.sh
+exit 0

=== modified file 'webbrowser-app-autopilot/tslist.auto'
--- webbrowser-app-autopilot/tslist.auto	2013-07-22 22:27:03 +0000
+++ webbrowser-app-autopilot/tslist.auto	2013-08-24 00:12:29 +0000
@@ -1,4 +1,4 @@
 -
-  discovery_cmd: "autopilot list webbrowser_app | grep webbrowser_app | sed -e 's/^.*webbrowser_app.tests.//'"
-  test_cmd: utah-autopilot run -v webbrowser_app.tests.{}
+  discovery_cmd: autopilot-list webbrowser_app
+  test_cmd: autopilot-run webbrowser_app.tests.{}