Merge lp:~osomon/ubuntu-system-settings/autopkgtest into lp:ubuntu-system-settings

Proposed by Olivier Tilloy on 2016-06-14
Status: Needs review
Proposed branch: lp:~osomon/ubuntu-system-settings/autopkgtest
Merge into: lp:ubuntu-system-settings
Prerequisite: lp:~osomon/ubuntu-system-settings/fix-1592475
Diff against target: 83 lines (+62/-0)
3 files modified
debian/control (+1/-0)
debian/tests/control (+21/-0)
debian/tests/touch-session-autopilot (+40/-0)
To merge this branch: bzr merge lp:~osomon/ubuntu-system-settings/autopkgtest
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing on 2016-06-15
Ken VanDine 2016-06-14 Approve on 2016-06-15
PS Jenkins bot continuous-integration Pending
Review via email: mp+297374@code.launchpad.net

Commit message

Add autopkgtest to run autopilot tests.

To post a comment you must log in.

FAILED: Continuous integration, rev:1666
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/15/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/605
    FAILURE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/76/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/605
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/575
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/575
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/568
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/568/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/568
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/568/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/568
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/568/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/568
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/568/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/568
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/568/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/568
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/568/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/15/rebuild

review: Needs Fixing (continuous-integration)
Ken VanDine (ken-vandine) wrote :

Looks good, once we get the infrastructure kinks worked out it should be a great addition

review: Approve

FAILED: Continuous integration, rev:1666
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/19/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/619
    UNSTABLE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/79
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/619
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/589
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/589
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/582
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/582/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/582
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/582/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/582
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/582/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/582
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/582/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/582
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/582/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/582
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/582/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/19/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

1666. By Olivier Tilloy on 2016-06-14

Add autopkgtest to run autopilot tests.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-05-25 06:02:03 +0000
3+++ debian/control 2016-06-14 17:46:49 +0000
4@@ -58,6 +58,7 @@
5 # code again.
6 Vcs-Bzr: https://code.launchpad.net/~system-settings-touch/ubuntu-system-settings/trunk
7 X-Python3-Version: >= 3.2
8+XS-Testsuite: autopkgtest
9 X-Ubuntu-Use-Langpack: yes
10
11 Package: ubuntu-system-settings
12
13=== added directory 'debian/tests'
14=== added file 'debian/tests/control'
15--- debian/tests/control 1970-01-01 00:00:00 +0000
16+++ debian/tests/control 2016-06-14 17:46:49 +0000
17@@ -0,0 +1,21 @@
18+# Copyright 2016 Canonical
19+#
20+# This program is free software: you can redistribute it and/or modify it
21+# under the terms of the GNU General Public License version 3, as published
22+# by the Free Software Foundation.
23+#
24+# This program is distributed in the hope that it will be useful,
25+# but WITHOUT ANY WARRANTY; without even the implied warranty of
26+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27+# GNU General Public License for more details.
28+#
29+# You should have received a copy of the GNU General Public License
30+# along with this program. If not, see <http://www.gnu.org/licenses/>.
31+
32+# autopkgtest is a test dependency so we don't need to copy
33+# ubuntu-touch-session to the testbed but can use it from autopkgtest instead
34+
35+Test-Command: /bin/sh -ex debian/tests/touch-session-autopilot ubuntu_system_settings
36+Restrictions: allow-stderr
37+Classes: ubuntu-touch
38+Depends: ubuntu-system-settings-autopilot, autopkgtest, python3-evdev, procps, sudo
39
40=== added file 'debian/tests/touch-session-autopilot'
41--- debian/tests/touch-session-autopilot 1970-01-01 00:00:00 +0000
42+++ debian/tests/touch-session-autopilot 2016-06-14 17:46:49 +0000
43@@ -0,0 +1,40 @@
44+#!/bin/sh
45+
46+# Copyright 2015-2016 Canonical
47+#
48+# This program is free software: you can redistribute it and/or modify it
49+# under the terms of the GNU General Public License version 3, as published
50+# by the Free Software Foundation.
51+#
52+# This program is distributed in the hope that it will be useful,
53+# but WITHOUT ANY WARRANTY; without even the implied warranty of
54+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
55+# GNU General Public License for more details.
56+#
57+# You should have received a copy of the GNU General Public License
58+# along with this program. If not, see <http://www.gnu.org/licenses/>.
59+
60+# This runs the $1 autopilot suite ensuring that the testbed is configured
61+# properly
62+
63+SUITE=$1
64+
65+set -e
66+
67+if ! pgrep -f unity-system-compositor ; then
68+ # We're not using Mir, setup enough of an X stack
69+
70+ # FIXME: We won't need an X stack once Mir provides mirvfb or any other
71+ # mean to test consistently on all platforms -- vila 2015-04-22
72+ sudo -A ADT_NORMAL_USER=${USER} sh -e /usr/share/autopkgtest/setup-commands/ubuntu-touch-session
73+ # Import the environment produced above in the current shell
74+ set -a
75+ . /etc/environment
76+elif pgrep -f unity8 ; then
77+ # Work around https://launchpad.net/bugs/1574706
78+ initctl --session restart unity8
79+ sleep 20
80+ gdbus call --session --dest com.canonical.UnityGreeter --object-path / --method com.canonical.UnityGreeter.HideGreeter
81+fi
82+
83+autopilot3 run --verbose --format xml --output "${ADT_ARTIFACTS}/${SUITE}.xml" ${SUITE}

Subscribers

People subscribed via source and target branches