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