Merge lp:~jibel/phablet-tools/run_tests_from_custom_location into lp:phablet-tools

[Jean-Baptiste Lallement]

* phablet-test-run:
  - Add option -t LOCATION to pull the tests from a local directory or a bzr uri e.g lp:~user/.../test_app/. For bzr, the project is not branched, only the location passed in argument is exported

* phablet-test-run:
  - Add option -t LOCATION to pull the tests from a local directory or a bzr uri e.g lp:~user/.../test_app/. For bzr, the project is not branched, only the location passed in argument is exported

[lp:~jibel/phablet-tools/run_tests_from_custom_location]

237. By Jean-Baptiste Lallement on 2014-02-05

* phablet-test-run: Changed hardcoded phablet user to $USER

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:236
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/267/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-armhf-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-i386-ci/39

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/267/rebuild

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

36 + wdir=/home/$USER
37 + if [ -n "$TESTS_LOCATION" ]; then
38 + wdir=${REMOTE_TESTBASE}
39 + fi

if you change this, you will also need to change phablet-click-test-setup (which is being renamed as well, and most of it obsolete as soon as py3 is ready).

Can you detail what this is going to be used for? Seems to be something similar to what balloons asked me to do.

[lp:~jibel/phablet-tools/run_tests_from_custom_location]

238. By Jean-Baptiste Lallement on 2014-02-05

* phablet-test-run: Fixed working directory to the same value used in phablet-click-test-setup and create it if it doesn't exist to fix error in current builds

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:237
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/268/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-armhf-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-i386-ci/40

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/268/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

This is similar, not quite the 1-click solution I was asking for with app developers. However, this will allow arbitrary (click or not) tests to be written and run against a device and iterated on. For the test writer, I will iterate on tests against apps that already are installed; thus I don't need to build them, merely update the tests and run them. This run functionality makes sense in phablet-test-run I believe.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:238
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/269/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-armhf-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-i386-ci/41

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/269/rebuild

review: Approve (continuous-integration)

Unmerged revisions

238. By Jean-Baptiste Lallement on 2014-02-05

* phablet-test-run: Fixed working directory to the same value used in phablet-click-test-setup and create it if it doesn't exist to fix error in current builds

237. By Jean-Baptiste Lallement on 2014-02-05

* phablet-test-run: Changed hardcoded phablet user to $USER

236. By Jean-Baptiste Lallement on 2014-02-05

phablet-test-run: Add option -t LOCATION to pull the tests from a local directory or a bzr uri e.g lp:~user/.../test_app/. For bzr, the project is not branched, only the location passed in argument is exported

=== modified file 'phablet-test-run'
--- phablet-test-run	2014-01-20 19:59:53 +0000
+++ phablet-test-run	2014-02-05 22:09:22 +0000
@@ -19,6 +19,8 @@
 LOCALPACKAGES=""
 RESULTDIR=""
 ARTIFACTS=""
+TESTS_LOCATION=""
+REMOTE_TESTBASE="/tmp/autopilot_tests"
 
 EXECUTE_COMMAND=0
 USER=phablet
@@ -29,7 +31,7 @@
 
 print_usage() {
     cat << EOF
-usage: $0 [-s SERIAL] [-s] [-n] [-x] [-v] [-p PACKAGENAME] [-c PACKAGE] [-o DIR] [-a ARTIFACT] testsuite
+usage: $0 [-s SERIAL] [-s] [-n] [-x] [-v] [-p PACKAGENAME] [-c PACKAGE] [-o DIR] [-a ARTIFACT] [-t LOCATION] testsuite
 
   Run the specified testsuite on the device
 
@@ -40,6 +42,8 @@
   -o DIR           Test report and artifacts output dir
   -a ARTIFACT      Artifact to fetch after the test, may be used multiple times (requires -o)
   -x               Execute command line, will not use autopilot by default
+  -t LOCATION      Test location. It can be a local directory or an uri to a
+                   bzr location
   -v               Run autopilot with -v option for more verbose output
 EOF
 }
@@ -103,7 +107,11 @@
     # adb shell always returns 0, so we have to do some hackery to get the
     # actual RC from the test
     {
-        apbase="sudo -iu $USER bash -ic \"cd /home/phablet/autopilot; autopilot run $VERBOSE"
+        wdir=/home/$USER/autopilot
+        if [ -n "$TESTS_LOCATION" ]; then
+            wdir=${REMOTE_TESTBASE}
+        fi
+        apbase="sudo -iu $USER bash -ic \"mkdir -p $wdir; cd $wdir; autopilot run $VERBOSE"
         if [ "$RESULTDIR" ]; then
             adb shell "$apbase -o /tmp/test_results.xml -f xml $TESTSUITE\"; echo ADB_RC=\$?"
             echo "***** Test summary *****"
@@ -146,7 +154,35 @@
     fi
 }
 
-while getopts a:c:hnxo:p:s:v opt; do
+pull_tests() {
+    # Pull test from a local directory or launchpad branch to the device
+    #
+    # $1: Tests URI either path to a local autopilot tests directory or lp
+    #     branch
+    testdir=$(mktemp -d /tmp/$(basename $0).XXXXXX)
+    location=""
+
+    if [ "$( echo $1 | cut -c-3)" = "lp:" ]; then
+        echo "Branching tests from $1"
+        ( cd $testdir; bzr  export $(basename $1) $1 )
+        location=${testdir}/$(basename $1)
+    elif [ -d "$1" ]; then
+        echo "Using tests from local directory: $1"
+        location=$1
+    else
+        echo "Invalid test directory: $location"
+        exit 1
+    fi
+
+    remotedir=${REMOTE_TESTBASE}/$(basename $location)
+    if [ -d "$location" ]; then
+        exec_with_adb rm -Rf $REMOTE_TESTBASE
+        exec_with_adb mkdir -p $remotedir
+        adb push $location $remotedir
+    fi
+    rm -Rf $testdir
+}
+while getopts a:c:hnxo:p:s:t:v opt; do
     case $opt in
     a)
         ARTIFACTS="$ARTIFACTS $OPTARG"
@@ -170,6 +206,9 @@
     s)
         ADBOPTS="-s $OPTARG"
         ;;
+    t)
+        TESTS_LOCATION="$OPTARG"
+        ;;
     x)
         EXECUTE_COMMAND=1
         ;;
@@ -189,6 +228,10 @@
 
 install_packages
 
+if [ ! -z "$TESTS_LOCATION" ]; then
+    pull_tests $TESTS_LOCATION
+fi
+
 if [ $NOSHELL -eq 1 ]; then
     echo "Disabling shell"
     disable_shell