Merge lp:~dpniel/ubiquity/fix-runner into lp:ubiquity

[Dan Chapman ]

Fixes the autopilot test runner for Ubuntu-GNOME and Ubuntu-MATE

[lp:~dpniel/ubiquity/fix-runner]

6314. By Dan Chapman  on 2015-09-05

Remove --debug flag from run-autopilot.sh

[Max Brustkern (nuclearbob)]

This code appears to break the runner. I get a missing ;; in the logs. I can try proposing a patch after I test the other merge proposals.

review: Needs Fixing

[lp:~dpniel/ubiquity/fix-runner]

6315. By Dan Chapman  on 2015-09-08

Commit missing ;; in run-autopilot.sh

[Dan Chapman  (dpniel)]

Ooops!

This should be fixed now.

[lp:~dpniel/ubiquity/fix-runner]

6316. By Dan Chapman  on 2015-09-08

Seems I missed this when seperating my patches for commiting.

Sorry about that

[Mathieu Trudel-Lapierre (cyphermox)]

review: Approve

=== modified file 'autopilot/ubiquity-autopilot-runner/custom-installation/iso-override/usr/local/bin/run-autopilot.sh'
--- autopilot/ubiquity-autopilot-runner/custom-installation/iso-override/usr/local/bin/run-autopilot.sh	2015-08-25 16:19:22 +0000
+++ autopilot/ubiquity-autopilot-runner/custom-installation/iso-override/usr/local/bin/run-autopilot.sh	2015-09-08 17:44:07 +0000
@@ -61,20 +61,37 @@
 
 
 # Specific configurations for various DE
-case $SESSION in
-    ubuntu)    # Covers Ubuntu and Edubuntu
-        SESSION_LOG=$HOME/.cache/upstart/gnome-session.log
-        ;;
-    xubuntu)
-        SESSION_LOG=$HOME/.cache/upstart/startxfce4.log
-        ;;
-    Lubuntu)
-        SESSION_LOG=$HOME/.cache/lxsession/Lubuntu/run.log
-        ARTIFACTS="$ARTIFACTS $HOME/.cache/lxsession"
-        ;;
-    gnome)     # ubuntu-gnome
-        SESSION_LOG=$HOME/.cache/upstart/gnome-session.log
-esac
+if [ -n "${SESSION+1}" ]; then
+    case $SESSION in
+        ubuntu)    # Covers Ubuntu and Edubuntu
+            SESSION_LOG=$HOME/.cache/upstart/gnome-session.log
+            ;;
+        xubuntu)
+            SESSION_LOG=$HOME/.cache/upstart/startxfce4.log
+            ;;
+        Lubuntu)
+            SESSION_LOG=$HOME/.cache/lxsession/Lubuntu/run.log
+            ARTIFACTS="$ARTIFACTS $HOME/.cache/lxsession"
+            ;;
+    esac
+elif [ -n "${DESKTOP_SESSION+1}" ]; then
+    # These 2 don't seem to log apt stuff to syslog
+    # And there doesn't seem to be a user session log???
+    # So let's tail it and also include in the artifacts
+    case $DESKTOP_SESSION in
+        mate)    # Covers Ubuntu-mate
+            SESSION_LOG=/var/log/apt/term.log
+            ARTIFACTS="$ARTIFACTS /var/log/apt"
+            ;;
+        gnome) #ubuntu-gnome
+            SESSION_LOG=/var/log/apt/term.log
+            ARTIFACTS="$ARTIFACTS /var/log/apt"
+            ;;
+    esac
+else
+    echo "I: Unknown SESSION"
+    exit 1
+fi
 
 PACKAGES="bzr ssh python3-autopilot libautopilot-gtk python3-xlib \
     recordmydesktop"

=== added directory 'autopilot/ubiquity-autopilot-runner/custom-installation/iso-override/usr/share'
=== added directory 'autopilot/ubiquity-autopilot-runner/custom-installation/iso-override/usr/share/mate'
=== added directory 'autopilot/ubiquity-autopilot-runner/custom-installation/iso-override/usr/share/mate/autostart'
=== added file 'autopilot/ubiquity-autopilot-runner/custom-installation/iso-override/usr/share/mate/autostart/autopilot.desktop'
--- autopilot/ubiquity-autopilot-runner/custom-installation/iso-override/usr/share/mate/autostart/autopilot.desktop	1970-01-01 00:00:00 +0000
+++ autopilot/ubiquity-autopilot-runner/custom-installation/iso-override/usr/share/mate/autostart/autopilot.desktop	2015-09-08 17:44:07 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Fire-up Autopilot tests for Ubiquity
+Comment=Starts the Autopilot tests
+Exec=/usr/local/bin/run-autopilot.sh -R
+Terminal=false
+Type=Application
+Categories=
+X-GNOME-Autostart-Delay=10