Merge lp:~doanac/ubuntu-test-cases/target-host-testing into lp:ubuntu-test-cases/smoke-touch-apps

[Andy Doan]

This is the last part of my set of changes. It provides host based scripts so that all tests can be run via the host.

[Chris Johnston (cjohnston)]

When running from the host, utah expects to be run as root. I'm thinking that being run from root should be done in this MP that 'if FROM_HOST, sudo ....' type of thing

[Paul Larson (pwlars)]

Looks good, only comment I have is that the ${UTAH_PHABLET_CMD} ... bit is mostly the same between test_from_host() and test_from_target(). Might be nice to combine them a bit more, but not critical.

review: Approve

[lp:~doanac/ubuntu-test-cases/target-host-testing]

94. By Andy Doan on 2013-08-27

make from-host run utah as root

as per cjohnston's review

=== modified file 'jenkins/jenkins.sh'
--- jenkins/jenkins.sh	2013-08-23 23:35:53 +0000
+++ jenkins/jenkins.sh	2013-08-27 15:42:49 +0000
@@ -4,6 +4,8 @@
 ## Intersting environment variables that must be set:
 ##  ANDROID_SERIAL - specify another android device
 ##  APP - the name of the app to test, ie share_app_autopilot
+##  QUICK - if set, skips the reboot and wait-for-network logic
+##  FROM_HOST - if set, runs the test from the host instead of the target
 
 set -e
 
@@ -23,6 +25,35 @@
 	set +e
 }
 
+test_from_target() {
+	# 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 \
+		-l ${TESTSUITE_TARGET}/master.run
+}
+
+test_from_host() {
+	export ANDROID_SERIAL   # need for utils/hosts scripts
+
+	export PATH=${BASEDIR}/utils/host:${PATH}
+
+	# allow for certain commands to run from host/target
+	# see unity8-autopilot/ts_control for example
+	export TARGET_PREFIX=adb-shell
+
+	sudo TARGET_PREFIX=$TARGET_PREFIX PATH=$PATH ${UTAH_PHABLET_CMD} \
+		-s ${ANDROID_SERIAL} \
+		--from-host \
+		--results-dir ${RESDIR} \
+		--skip-install --skip-network --skip-utah \
+                --pull /var/crash \
+		-l ${TESTSUITE_HOST}/master.run
+}
+
 main() {
 	rm -rf clientlogs
 	mkdir clientlogs
@@ -51,6 +82,7 @@
 		echo "SKIPPING phone reboot..."
 	fi
 
+<<<<<<< TREE
 	# push the runlist over to the test:
 	adb push ${BASEDIR} ${TESTSUITE_TARGET_BASE} &> /dev/null
 	${UTAH_PHABLET_CMD} \
@@ -60,6 +92,16 @@
 		--pull /var/crash \
 		-l ${TESTSUITE_TARGET}/master.run
 	adb shell 'rm -f /var/crash/*'
+=======
+	if [ -z $FROM_HOST ] ; then
+		echo "launching test on the target...."
+		test_from_target
+	else
+		echo "launching test from the host...."
+		test_from_host
+	fi
+        adb shell 'rm -f /var/crash/*'
+>>>>>>> MERGE-SOURCE
 
 	if ! `grep "^errors: [!0]" < $UTAHFILE >/dev/null` ; then
 		echo "errors found"

=== added file 'memevent/setup.sh'
--- memevent/setup.sh	1970-01-01 00:00:00 +0000
+++ memevent/setup.sh	2013-08-27 15:42:49 +0000
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+# copy the autopilot scripts over if needed
+[ -z $ANDROID_SERIAL ] || adb push ./ubuntu_test_cases /home/phablet/autopilot/ubuntu_test_cases
+
+PKGS="camera-app-autopilot gallery-app-autopilot mediaplayer-app-autopilot webbrowser-app-autopilot" prepare-autopilot-test.sh

=== modified file 'memevent/ts_control'
--- memevent/ts_control	2013-08-21 22:58:19 +0000
+++ memevent/ts_control	2013-08-27 15:42:49 +0000
@@ -1,1 +1,1 @@
-ts_setup: PKGS="camera-app-autopilot gallery-app-autopilot mediaplayer-app-autopilot webbrowser-app-autopilot" prepare-autopilot-test.sh
+ts_setup: ./setup.sh

=== modified file 'phone-app-connected-autopilot/setup.sh'
--- phone-app-connected-autopilot/setup.sh	2013-08-21 22:58:19 +0000
+++ phone-app-connected-autopilot/setup.sh	2013-08-27 15:42:49 +0000
@@ -1,20 +1,36 @@
 #!/bin/sh
 
-set -e
+set -ex
 
 # 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
 
-# remove old logs so the receive test will work
-rm /home/phablet/.local/share/TpLogger/logs/ofono_ofono_account0/* -rf
-
-# set up the config file for the test
-NUMBER=$(./sms_self.py --list)
-cat ./testnumbers.cfg | sed -e "s/TODO/+$NUMBER/" > /home/phablet/.testnumbers.cfg
-
-# now send an sms to ourself
-./sms_self.py
+
+if [ -z $ANDROID_SERIAL ] ; then
+	# set up the config file for the test
+	NUMBER=$(./sms_self.py --list)
+	cat ./testnumbers.cfg | sed -e "s/TODO/+$NUMBER/" > /home/phablet/.testnumbers.cfg
+
+	# remove old logs so the receive test will work
+	rm /home/phablet/.local/share/TpLogger/logs/ofono_ofono_account0/* -rf
+
+	# now send an sms to ourself
+	./sms_self.py
+else
+	echo "test running from host"
+	adb push ./sms_self.py /home/phablet/autopilot/
+
+	# set up the config file for the test
+	NUMBER=$(adb-shell /home/phablet/autopilot/sms_self.py --list | head -n1)
+	cat ./testnumbers.cfg | sed -e "s/TODO/+$NUMBER/" > .testnumbers.cfg
+	adb push .testnumbers.cfg /home/phablet/.testnumbers.cfg
+	rm .testnumbers.cfg
+
+	# remove old logs so the receive test will work
+	adb-shell rm /home/phablet/.local/share/TpLogger/logs/ofono_ofono_account0/* -rf
+	adb-shell /home/phablet/autopilot/sms_self.py
+fi
+
 sleep 10s  # try and let the message come through
-
 PKGS="phone-app-connected-autopilot" prepare-autopilot-test.sh

=== modified file 'systemsettle/systemsettle-after/tc_control'
--- systemsettle/systemsettle-after/tc_control	2013-08-20 22:53:20 +0000
+++ systemsettle/systemsettle-after/tc_control	2013-08-27 15:42:49 +0000
@@ -7,4 +7,3 @@
 type: userland
 timeout: 120
 command: ../systemsettle.sh -c5 -d2 -p 97.5
-run_as: root

=== modified file 'systemsettle/systemsettle-before/tc_control'
--- systemsettle/systemsettle-before/tc_control	2013-08-20 22:53:20 +0000
+++ systemsettle/systemsettle-before/tc_control	2013-08-27 15:42:49 +0000
@@ -7,4 +7,3 @@
 type: userland
 timeout: 120
 command: ../systemsettle.sh -c5 -d2 -p 97.5
-run_as: root

=== modified file 'systemsettle/systemsettle.sh'
--- systemsettle/systemsettle.sh	2013-08-19 18:56:07 +0000
+++ systemsettle/systemsettle.sh	2013-08-27 15:42:49 +0000
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# Configuration variables:
+#  TARGET_PREFIX - Allows this to be run from the host, by providings something
+#                  like TARGET_PREFIX="adb shell"
+
 set -e
 
 # default exit code storage
@@ -90,7 +94,7 @@
   # get top
   echo "TOP DUMP (after settle run: $settle_count)" >> $top_log
   echo "========================" >> $top_log
-  top -b -d $top_wait -n $top_repeat >> $top_log
+  ${TARGET_PREFIX} top -b -d $top_wait -n $top_repeat >> $top_log
   cat $top_log | grep '.Cpu.*' | tail -n $top_tail > $top_log.reduced
   echo >> $top_log
 

=== modified file 'unity8-autopilot/setup.sh'
--- unity8-autopilot/setup.sh	2013-08-21 22:58:19 +0000
+++ unity8-autopilot/setup.sh	2013-08-27 15:42:49 +0000
@@ -3,4 +3,4 @@
 set -e
 
 NO_UNLOCK=1 PKGS="unity8-autopilot" prepare-autopilot-test.sh
-sudo -i -u phablet bash -ic "stop unity8"
+$TARGET_PREFIX sudo -i -u phablet stop unity8

=== modified file 'unity8-autopilot/ts_control'
--- unity8-autopilot/ts_control	2013-08-01 16:39:36 +0000
+++ unity8-autopilot/ts_control	2013-08-27 15:42:49 +0000
@@ -1,2 +1,2 @@
-ts_setup: sh ./setup.sh
-ts_cleanup: 'sudo -i -u phablet bash -ic "start unity8"'
+ts_setup: TARGET_PREFIX=$TARGET_PREFIX ./setup.sh
+ts_cleanup: $TARGET_PREFIX sudo -i -u phablet start unity8

=== added directory 'utils/host'
=== added file 'utils/host/adb-shell'
--- utils/host/adb-shell	1970-01-01 00:00:00 +0000
+++ utils/host/adb-shell	2013-08-27 15:42:49 +0000
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# The "adb shell" command doesn't return an error if the command you execute
+# resulted in an error. This is a wrapper to return the command's true return code.
+
+# NOTE: This script uses some specific bash'isms to keep things short and simple
+
+set -eu
+
+pat='ADB_RC=([[:digit:]]+)'
+
+{
+	adb -s $ANDROID_SERIAL shell "$* ; echo ADB_RC=\$?"
+} | while read line; do
+	echo $line
+	if [[ $line =~ $pat ]] ; then
+		rc=${BASH_REMATCH[1]}
+		exit $rc
+	fi
+done

=== added file 'utils/host/autopilot-list'
--- utils/host/autopilot-list	1970-01-01 00:00:00 +0000
+++ utils/host/autopilot-list	2013-08-27 15:42:49 +0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+app=$1
+pat=$app
+rep=$app.tests.
+
+if [ -z "$app" ] ; then
+	echo "USAGE: $0 <app> [pattern] [replace]"
+	exit 1
+fi
+[ -z "$2" ] || pat=$2
+[ -z "$3" ] || rep=$3
+
+#NOTE we just use adb shell here, because we don't have to catch errors. the greps
+# will work around that
+adb shell sudo -i -u phablet bash -ic \"PYTHONPATH=/home/phablet/autopilot autopilot list $app\" | grep $pat | sed -e "s/^.*${rep}//"

=== added file 'utils/host/autopilot-run'
--- utils/host/autopilot-run	1970-01-01 00:00:00 +0000
+++ utils/host/autopilot-run	2013-08-27 15:42:49 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+adb-shell sudo -i -u phablet bash -ic \"PYTHONPATH=/home/phablet/autopilot autopilot run -v $*\"

=== added file 'utils/host/prepare-autopilot-test.sh'
--- utils/host/prepare-autopilot-test.sh	1970-01-01 00:00:00 +0000
+++ utils/host/prepare-autopilot-test.sh	2013-08-27 15:42:49 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+adb-shell PKGS=\"$PKGS\" prepare-autopilot-test.sh