Merge lp:~nskaggs/autopilot/add-wm-sandbox-run into lp:autopilot

[Nicholas Skaggs]

Add window manager support for autopilot sandbox run, fixes 1379508

Add window manager support for autopilot sandbox run, fixes 1379508

[Nicholas Skaggs (nskaggs)]

this doesn't handle arguments correctly for some reason, but otherwise works. I'd appreciate any cleanup help.

[lp:~nskaggs/autopilot/add-wm-sandbox-run]

518. By Nicholas Skaggs on 2014-12-01

remove debugging echo

[Nicholas Skaggs (nskaggs)]

getopts, you are mine. Thanks robotfuel for the pointer about how : works.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:518
http://jenkins.qa.ubuntu.com/job/autopilot-ci/940/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-amd64-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-amd64-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-i386-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-vivid-i386-ci/3/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid-autopilot/6
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid-autopilot/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/265
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/265/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/940/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/autopilot/add-wm-sandbox-run]

519. By Nicholas Skaggs on 2015-05-21

turn off usewm by default

[Christopher Lee (veebers)]

One inline question.

review: Needs Information

[Nicholas Skaggs (nskaggs)]

Replied.

[Christopher Lee (veebers)]

LGTM, only bottom approving it for me as there is a landing/release happening.

review: Approve

[Nicholas Skaggs (nskaggs)]

Tested by running

autopilot3-sandbox-run qml2/
autopilot3-sandbox-run -s 400x600x24 qml2/
autopilot3-sandbox-run -w tinywm qml2/
autopilot3-sandbox-run -w tinywm -s 400x600x24 qml2/
autopilot3-sandbox-run -X qml2/
autopilot3-sandbox-run -X -w tinywm qml2/
autopilot3-sandbox-run -X -w tinywm -s 400x600x24 qml2/

Each scenario should work as expected. Specifically, running with -w should only launch a wm

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:519
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1076/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/7/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2946
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2523
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2944
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2944/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20739

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/1076/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Veebers is this going to make it in the next release?

[Christopher Lee (veebers)]

LGTM

review: Approve

=== modified file 'bin/autopilot3-sandbox-run'
--- bin/autopilot3-sandbox-run	2014-05-15 06:18:19 +0000
+++ bin/autopilot3-sandbox-run	2015-05-21 20:20:26 +0000
@@ -3,11 +3,11 @@
 #
 # Runner to execute autopilot locally
 #
-# This scripts run autopilot in a "fake" X server, either headless with xvfb
-# or nested with Xephyr
+# This scripts run autopilot in a "fake" X server, and optionally a
+# window manager with either headless with xvfb or nested with Xephyr
 #
 
-# Copyright (C) 2013 Canonical
+# Copyright (C) 2013-2015 Canonical
 #
 # Authors: Jean-Baptiste Lallement <[e-mail]>
 #
@@ -38,7 +38,9 @@
 
 SERVERNUM=5
 SCREEN="1024x768x24"
-
+USEWM=0
+WINDOWMANAGER="ratpoison"
+WINDOWMANAGER_CMD="$(which $WINDOWMANAGER||true)"
 DBUS_SESSION_BUS_PID=""
 X_PID=""
 
@@ -48,17 +50,18 @@
 Usage: $(basename $0) [OPTIONS...] TEST [TEST...]
 Runs autopilot tests in a 'fake' Xserver with Xvfb or Xephyr. autopilot runs
 in Xvfb by default.
-    
+
     TEST: autopilot tests to run
 
 Options:
-    -h, --help           This help
-    -d, --debug          Enable debug mode
-    -a, --autopilot ARG  Pass arguments ARG to 'autopilot run'
-    -X, --xephyr         Run in nested mode with Xephyr
-    -s, --screen WxHxD   Sets screen width, height, and depth to W, H, and D
-                         respectively (default: $SCREEN)
-
+    -h, --help             This help
+    -d, --debug            Enable debug mode
+    -a, --autopilot ARG    Pass arguments ARG to 'autopilot run'
+    -X, --xephyr           Run in nested mode with Xephyr
+    -s, --screen WxHxD     Sets screen width, height, and depth to W, H, and D
+                           respectively (default: $SCREEN)
+    -w, --windowmanager WM Start a window manager WM before executing tests
+                           (suggested: $WINDOWMANAGER)
 EOF
     RC=1
     exit
@@ -117,8 +120,8 @@
 
 trap on_exit EXIT INT QUIT ABRT PIPE TERM
 
-SHORTOPTS="hda:s:X"
-LONGOPTS="help,debug,autopilot:,screen:,xephyr"
+SHORTOPTS="hda:s:Xw:"
+LONGOPTS="help,debug,autopilot:,screen:,xephyr,windowmanager:"
 
 TEMP=$(getopt -o $SHORTOPTS --long $LONGOPTS -- "$@")
 eval set -- "$TEMP"
@@ -138,6 +141,14 @@
         -s|-screen)
             SCREEN=$2
             shift 2;;
+        -w|--windowmanager)
+            USEWM=1
+            WINDOWMANAGER=$2
+            WINDOWMANAGER_CMD="$(which $WINDOWMANAGER||true)"
+            [ ! -x "$WINDOWMANAGER_CMD" ] && \
+                echo "E: $WINDOWMANAGER Executable not found." &&\
+                RC=1 && exit 1
+            shift 2;;
         -X|--xephyr)
             XEPHYR=1
             [ ! -x "$XEPHYR_CMD" ] && \
@@ -154,7 +165,7 @@
 if [ $XEPHYR -eq 0 -a ! -x "$XVFB_CMD" ]; then
     echo "E: Xvfb executable not found. Please install xvfb"
     RC=1
-    exit 
+    exit
 fi
 
 TESTLIST="$@"
@@ -171,6 +182,10 @@
 
 export XAUTHORITY=/dev/null
 wait_for_x $SERVERNUM
+if [ "$USEWM" -eq 1 ]; then
+    echo "I: Starting window manager: $WINDOWMANAGER_CMD"
+    dbus-launch --exit-with-session $WINDOWMANAGER_CMD &
+fi
 echo "I: Starting autopilot"
 dbus-launch --exit-with-session python3 -m autopilot.run run $AP_OPT $TESTLIST || RC=$?
 echo "I: autopilot tests done"