Checkbox Provider - Base

Merge ~sylvain-pineau/plainbox-provider-checkbox/+git/packaging:remove-python3-guacamole into plainbox-provider-checkbox:master

  1. Git
  2. lp:~sylvain-pineau/plainbox-provider-checkbox/+git/packaging
  3. remove-python3-guacamole
  4. Merge into master
Proposed by Sylvain Pineau
Status: Superseded
Proposed branch: ~sylvain-pineau/plainbox-provider-checkbox/+git/packaging:remove-python3-guacamole
Merge into: plainbox-provider-checkbox:master
Diff against target: 1326 lines (+785/-0) (has conflicts)
30 files modified
bin/ipmi_test.py (+4/-0)
bin/kernel_taint_test.py (+64/-0)
bin/wwan_tests.py (+41/-0)
debian/.git-dpm (+8/-0)
debian/changelog (+194/-0)
debian/compat (+1/-0)
debian/control (+68/-0)
debian/copyright (+96/-0)
debian/rules (+23/-0)
debian/source/format (+1/-0)
debian/source/lintian-overrides (+2/-0)
debian/upstream/signing-key.asc (+119/-0)
debian/watch (+4/-0)
manage.py (+4/-0)
units/bluetooth/jobs.pxu (+4/-0)
units/cpu/test-plan.pxu (+6/-0)
units/ethernet/test-plan.pxu (+3/-0)
units/fingerprint/test-plan.pxu (+14/-0)
units/gpio/test-plan.pxu (+3/-0)
units/info/jobs.pxu (+4/-0)
units/led/test-plan.pxu (+5/-0)
units/miscellanea/test-plan.pxu (+8/-0)
units/mobilebroadband/test-plan.pxu (+6/-0)
units/networking/test-plan.pxu (+16/-0)
units/power-management/test-plan.pxu (+18/-0)
units/suspend/suspend.pxu (+8/-0)
units/ubuntucore/jobs.pxu (+11/-0)
units/watchdog/jobs.pxu (+29/-0)
units/wireless/jobs.pxu (+3/-0)
units/wireless/test-plan.pxu (+18/-0)
Conflict in bin/ipmi_test.py
Conflict in bin/kernel_taint_test.py
Conflict in bin/wwan_tests.py
Conflict in manage.py
Conflict in units/bluetooth/jobs.pxu
Conflict in units/cpu/test-plan.pxu
Conflict in units/ethernet/test-plan.pxu
Conflict in units/fingerprint/test-plan.pxu
Conflict in units/gpio/test-plan.pxu
Conflict in units/info/jobs.pxu
Conflict in units/led/test-plan.pxu
Conflict in units/miscellanea/test-plan.pxu
Conflict in units/mobilebroadband/test-plan.pxu
Conflict in units/networking/test-plan.pxu
Conflict in units/power-management/test-plan.pxu
Conflict in units/suspend/suspend.pxu
Conflict in units/ubuntucore/jobs.pxu
Conflict in units/watchdog/jobs.pxu
Conflict in units/wireless/jobs.pxu
Conflict in units/wireless/test-plan.pxu
Reviewer Review Type Date Requested Status
Checkbox Developers Pending
Review via email: mp+408730@code.launchpad.net

This proposal has been superseded by a proposal from 2021-09-16.

Description of the change

Remove what should be the last bit of python3-guacamole

To post a comment you must log in.

Unmerged commits

af2a539... by Sylvain Pineau

debian:control: remove python3-guacamole from deps

f34bad5... by PMR <pmr@pmr-lander>

change version to 0.59.0-1
"new upstream version"

fd1b485... by PMR <pmr@pmr-lander>

record new upstream branch created by importing plainbox-provider-checkbox_0.59.0.orig.tar.gz and merge it

367bac1... by PMR <pmr@pmr-lander>

Import plainbox-provider-checkbox_0.59.0.orig.tar.gz

6ea59d2... by PMR <pmr@pmr-lander>

change version to 0.59.0~rc1-1
"new upstream version"

e24158a... by PMR <pmr@pmr-lander>

Import plainbox-provider-checkbox_0.59.0~rc1.orig.tar.gz

203a373... by PMR <pmr@pmr-lander>

record new upstream branch created by importing plainbox-provider-checkbox_0.59.0~rc1.orig.tar.gz and merge it

f38c81f... by PMR <pmr@pmr-lander>

change version to 0.58.0-1
"new upstream version"

529c39e... by PMR <pmr@pmr-lander>

Import plainbox-provider-checkbox_0.58.0.orig.tar.gz

e93a70c... by PMR <pmr@pmr-lander>

record new upstream branch created by importing plainbox-provider-checkbox_0.58.0.orig.tar.gz and merge it

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bin/ipmi_test.py b/bin/ipmi_test.py
2index f481134..de6c955 100755
3--- a/bin/ipmi_test.py
4+++ b/bin/ipmi_test.py
5@@ -73,7 +73,11 @@ class FreeIpmiTest:
6 # min. ipmi version to pass
7 self._ipmi_ver = 2.0
8 # subprocess call timeout (s)
9+<<<<<<< bin/ipmi_test.py
10 self._subproc_timeout = 15
11+=======
12+ self._subproc_timeout = 10
13+>>>>>>> bin/ipmi_test.py
14 # raised subproc exceptions to handle
15 # (decoupled from self._process_exc())
16 self._sub_process_excs = (
17diff --git a/bin/kernel_taint_test.py b/bin/kernel_taint_test.py
18index e8ddc2a..d701dac 100755
19--- a/bin/kernel_taint_test.py
20+++ b/bin/kernel_taint_test.py
21@@ -44,10 +44,17 @@ def find_taints(taint_file):
22 f = open(taint_file, "r")
23 taints = int(f.read())
24 except OSError:
25+<<<<<<< bin/kernel_taint_test.py
26 raise SystemExit(
27 "Kernel taint file ({}) not found!".format(taint_file))
28 print("Kernel taint value is {}".format(taints))
29 return taints
30+=======
31+ taints = -1
32+ print("Kernel taint file ({}) not found!".format(taint_file))
33+ print("Kernel taint value is {}".format(taints))
34+ return(taints)
35+>>>>>>> bin/kernel_taint_test.py
36
37
38 def get_modules():
39@@ -57,7 +64,11 @@ def get_modules():
40 for line in lsmod_output:
41 if line and 'Module' not in line:
42 modules.append(line.split()[0])
43+<<<<<<< bin/kernel_taint_test.py
44 return modules
45+=======
46+ return(modules)
47+>>>>>>> bin/kernel_taint_test.py
48
49
50 def process_out_of_tree_modules(modules):
51@@ -68,7 +79,11 @@ def process_out_of_tree_modules(modules):
52 if not check_output(shlex.split(cmd),
53 universal_newlines=True):
54 mod_list.append(mod)
55+<<<<<<< bin/kernel_taint_test.py
56 return mod_list
57+=======
58+ return(mod_list)
59+>>>>>>> bin/kernel_taint_test.py
60
61
62 def process_GPL_incompatible_modules(modules):
63@@ -80,11 +95,16 @@ def process_GPL_incompatible_modules(modules):
64 universal_newlines=True).strip()
65 if "GPL" not in license and "MIT" not in license:
66 mod_list.append((mod, license))
67+<<<<<<< bin/kernel_taint_test.py
68 return mod_list
69+=======
70+ return(mod_list)
71+>>>>>>> bin/kernel_taint_test.py
72
73
74 def remove_ignored_modules(modules):
75 # Remove modules we know will fail, but accept
76+<<<<<<< bin/kernel_taint_test.py
77 ignored_modules = ['icp',
78 'spl',
79 'zavl',
80@@ -94,11 +114,22 @@ def remove_ignored_modules(modules):
81 'znvpair',
82 'zunicode',
83 'zzstd']
84+=======
85+ ignored_modules = ['zfs',
86+ 'zunicode',
87+ 'zlua',
88+ 'zavl',
89+ 'icp',
90+ 'zcommon',
91+ 'znvpair',
92+ 'spl']
93+>>>>>>> bin/kernel_taint_test.py
94 for ignore_mod in ignored_modules:
95 try:
96 modules.remove(ignore_mod)
97 except ValueError:
98 pass
99+<<<<<<< bin/kernel_taint_test.py
100 return modules
101
102
103@@ -111,6 +142,13 @@ def main():
104 args = parser.parse_args()
105 taints = find_taints(args.taint_file)
106
107+=======
108+ return(modules)
109+
110+
111+def report_failures(taints):
112+ """Report the failure code and its meaning(s)."""
113+>>>>>>> bin/kernel_taint_test.py
114 # Below meaning strings are taken from
115 # https://www.kernel.org/doc/html/latest/admin-guide/tainted-kernels.html
116 taint_meanings = ["proprietary module was loaded",
117@@ -159,6 +197,7 @@ def main():
118 print("* Out of Tree modules found, "
119 "but they are expected and OK")
120 else:
121+<<<<<<< bin/kernel_taint_test.py
122 count += 1
123
124 if count == 0:
125@@ -168,6 +207,31 @@ def main():
126 return 0
127 else:
128 return 1
129+=======
130+ print("Taint bit value: {} ({})".format(i, taint_meanings[i]))
131+ count += 1
132+ if taints == 0:
133+ print("No kernel taints detected.")
134+
135+ if taints and count == 0:
136+ # we found only taint 11
137+ return count
138+ else:
139+ return taints
140+
141+
142+def main():
143+ parser = ArgumentParser()
144+ parser.add_argument('--taint-file',
145+ default="/proc/sys/kernel/tainted",
146+ help='The file that holds the taint information')
147+ args = parser.parse_args()
148+ taints = find_taints(args.taint_file)
149+ if taints < 0:
150+ return taints
151+
152+ return(report_failures(taints))
153+>>>>>>> bin/kernel_taint_test.py
154
155
156 if __name__ == '__main__':
157diff --git a/bin/wwan_tests.py b/bin/wwan_tests.py
158index a2af54e..cf5cfb6 100755
159--- a/bin/wwan_tests.py
160+++ b/bin/wwan_tests.py
161@@ -43,6 +43,7 @@ MMModemCapability = {
162 'MM_MODEM_CAPABILITY_ANY': 0xFFFFFFFF}
163
164
165+<<<<<<< bin/wwan_tests.py
166 def print_head(txt):
167 print("##", txt, flush=True)
168
169@@ -54,6 +55,8 @@ def print_cmd(cmd):
170 print("+", cmd, flush=True)
171
172
173+=======
174+>>>>>>> bin/wwan_tests.py
175 class MMDbus():
176 def __init__(self):
177 self._bus = dbus.SystemBus()
178@@ -240,6 +243,7 @@ class MMCLI():
179
180
181 def _create_3gpp_connection(wwan_if, apn):
182+<<<<<<< bin/wwan_tests.py
183 print_head("Creating 3GPP Connection")
184 cmd = ["nmcli", "c", "add",
185 "con-name", GSM_CON_ID,
186@@ -289,6 +293,35 @@ def _ping_test(if_name):
187 print_cmd(cmd)
188 subprocess.call(cmd)
189 print()
190+=======
191+ subprocess.check_call(["nmcli", "c", "add",
192+ "con-name", GSM_CON_ID,
193+ "type", "gsm",
194+ "ifname", wwan_if,
195+ "apn", apn])
196+
197+
198+def _wwan_radio_on():
199+ subprocess.check_call(["nmcli", "r", "wwan", "on"])
200+
201+
202+def _wwan_radio_off():
203+ subprocess.check_call(["nmcli", "r", "wwan", "off"])
204+
205+
206+def _destroy_3gpp_connection():
207+ subprocess.check_call(["nmcli", "c",
208+ "delete", GSM_CON_ID])
209+
210+
211+def _ping_test(if_name):
212+ ret_code = 1
213+ route = subprocess.call(["ip", "route", "add", TEST_IP, "dev", if_name])
214+ if route == 0:
215+ ret_code = subprocess.check_call(["ping", "-c", "4",
216+ "-I", if_name, TEST_IP])
217+ subprocess.call(["ip", "route", "del", TEST_IP, "dev", if_name])
218+>>>>>>> bin/wwan_tests.py
219 return ret_code
220
221
222@@ -315,7 +348,11 @@ class ThreeGppConnection():
223 pass
224 _destroy_3gpp_connection()
225 _wwan_radio_off()
226+<<<<<<< bin/wwan_tests.py
227 sys.exit(ret_code)
228+=======
229+ return ret_code
230+>>>>>>> bin/wwan_tests.py
231
232
233 class CountModems():
234@@ -367,7 +404,11 @@ class SimPresent():
235 mm = MMDbus()
236 mm_id = mm.equipment_id_to_mm_id(args.hw_id)
237 if not mm.sim_present(mm_id):
238+<<<<<<< bin/wwan_tests.py
239 sys.exit(1)
240+=======
241+ return 1
242+>>>>>>> bin/wwan_tests.py
243
244
245 class SimInfo():
246diff --git a/debian/.git-dpm b/debian/.git-dpm
247new file mode 100644
248index 0000000..f270695
249--- /dev/null
250+++ b/debian/.git-dpm
251@@ -0,0 +1,8 @@
252+# see git-dpm(1) from git-dpm package
253+367bac112ba08007d31fdff293610f34a091642b
254+367bac112ba08007d31fdff293610f34a091642b
255+367bac112ba08007d31fdff293610f34a091642b
256+367bac112ba08007d31fdff293610f34a091642b
257+plainbox-provider-checkbox_0.59.0.orig.tar.gz
258+7ff2f32c74f3ee76406019087734f538aa160bc4
259+1747886
260diff --git a/debian/changelog b/debian/changelog
261new file mode 100644
262index 0000000..4baa83c
263--- /dev/null
264+++ b/debian/changelog
265@@ -0,0 +1,194 @@
266+plainbox-provider-checkbox (0.59.0-1) UNRELEASED; urgency=medium
267+
268+ [ Pierre Equoy ]
269+ * Open for development (remove this message before releasing)
270+ * "new upstream version"
271+ * "new upstream version"
272+ * "new upstream version"
273+
274+ [ Sylvain Pineau ]
275+ * "new upstream version"
276+ * "new upstream version"
277+ * "new upstream version"
278+
279+ [ Pierre Equoy ]
280+ * "new upstream version"
281+ * "new upstream version"
282+
283+ [ Sylvain Pineau ]
284+ * "new upstream version"
285+ * "new upstream version"
286+ * "new upstream version"
287+ * "new upstream version"
288+ * "new upstream version"
289+ * "new upstream version"
290+ * "new upstream version"
291+ * "new upstream version"
292+ * "new upstream version"
293+ * "new upstream version"
294+ * "new upstream version"
295+ * "new upstream version"
296+ * "new upstream version"
297+ * "new upstream version"
298+ * "new upstream version"
299+ * "new upstream version"
300+ * "new upstream version"
301+ * "new upstream version"
302+ * "new upstream version"
303+ * "new upstream version"
304+ * "new upstream version"
305+ * "new upstream version"
306+ * "new upstream version"
307+ * "new upstream version"
308+ * "new upstream version"
309+ * "new upstream version"
310+ * "new upstream version"
311+ * "new upstream version"
312+ * "new upstream version"
313+ * "new upstream version"
314+ * "new upstream version"
315+ * "new upstream version"
316+ * "new upstream version"
317+ * "new upstream version"
318+ * "new upstream version"
319+ * "new upstream version"
320+ * "new upstream version"
321+ * "new upstream version"
322+
323+ [ Jenkins ]
324+ * "new upstream version"
325+ * "new upstream version"
326+ * "new upstream version"
327+ * "new upstream version"
328+ * "new upstream version"
329+ * "new upstream version"
330+ * "new upstream version"
331+ * "new upstream version"
332+ * "new upstream version"
333+ * "new upstream version"
334+ * "new upstream version"
335+ * "new upstream version"
336+ * "new upstream version"
337+ * "new upstream version"
338+ * "new upstream version"
339+ * "new upstream version"
340+ * "new upstream version"
341+ * "new upstream version"
342+ * "new upstream version"
343+ * "new upstream version"
344+ * "new upstream version"
345+ * "new upstream version"
346+ * "new upstream version"
347+ * "new upstream version"
348+ * "new upstream version"
349+ * "new upstream version"
350+ * "new upstream version"
351+ * "new upstream version"
352+
353+ -- Jenkins <jenkins@open-joey-201506-18558.maas> Mon, 12 Jul 2021 14:58:12 +0000
354+
355+plainbox-provider-checkbox (0.31) unstable; urgency=medium
356+
357+ [ Pierre Equoy ]
358+ * New upstream release
359+
360+ -- Pierre Equoy <pierre.equoy@canonical.com> Fri, 30 Sep 2016 15:18:21 +0800
361+
362+plainbox-provider-checkbox (0.25-1) unstable; urgency=medium
363+
364+ * New upstream maintenance release
365+ * debian/watch: match new upstream tarball names
366+ * debian/rules: simplify override_dh_auto_install since installation
367+ directories are all named plainbox-provider-checkbox
368+ * debian/control: remove python2.x, dh-python and obexd-client dependencies
369+ * debian/patches: New patch to depends on kmod instead of module-init-tools.
370+ (Closes: #811187)
371+
372+ -- Sylvain Pineau <sylvain.pineau@canonical.com> Fri, 15 Jan 2016 16:51:16 +0100
373+
374+plainbox-provider-checkbox (0.24-1) unstable; urgency=medium
375+
376+ * New upstream maintenance release
377+ * debian/control: Depend on more recent version of python3-checkbox-support
378+ and python3-plainbox.
379+
380+ -- Sylvain Pineau <sylvain.pineau@canonical.com> Thu, 07 Jan 2016 18:03:36 +0100
381+
382+plainbox-provider-checkbox (0.21.3-1) unstable; urgency=medium
383+
384+ * New upstream maintenance release:
385+ https://launchpad.net/plainbox-provider-checkbox/+milestone/0.21.1
386+ https://launchpad.net/plainbox-provider-checkbox/+milestone/0.21.2
387+ https://launchpad.net/plainbox-provider-checkbox/+milestone/0.21.3
388+
389+ -- Zygmunt Krynicki <zygmunt.krynicki@canonical.com> Tue, 04 Aug 2015 10:03:10 +0200
390+
391+plainbox-provider-checkbox (0.21-1) unstable; urgency=medium
392+
393+ * New upstream release
394+ * debian/control: wrap-and-sort
395+ * debian/rules: don't modify .pot/.po files present in the tree
396+ * debian/rules: rewrite provider directories to use more friendly names
397+ * debian/rules: disable strict validation
398+ * debian/watch: quote the last dot of the URL pattern
399+ * debian/upstream/signing-key.asc: add the public key of Sylvain
400+ Pineau (using gpg --armor --export-options export-minimal --export
401+ '7ED72CD1').
402+ * debian/copyright: bump Canonical copyright
403+ * debian/control: Use the new email address for the team
404+ (checkbox-devel@lists.ubuntu.com).
405+ * debian/control: Depend on more recent version of plainbox to get the
406+ packaging meta-data unit which blocks validation.
407+ * debian/control, debian/rules: Depend on python3-debian for plainbox
408+ packaging system integration. Activate plainbox packaging integration
409+ through "./manage.py packaging", "X-Plainbox-Provider: yes" and
410+ ${plainbox:Depends} and similar. This lets plainbox look at packaging
411+ meta-data units contained in the provider being packaged (at .txt.in, .txt
412+ and .pxu files) and determine appropriate dependencies. This lessens the
413+ maintenance burden on the package maintainer and shifts it onto the
414+ upstream developers to provide accurate packaging meta-data for each
415+ specific distribution. This also means that separate packaging for similar
416+ distributions (Debian, Ubuntu and bleeding-edge Ubuntu PPA is far easier
417+ to work with as bulk of the work is shared).
418+ * debian/copyright: de-duplicate licenses, as reported by lintian
419+ * debian/control: bump standards version to 3.9.6 (no change required)
420+
421+ -- Zygmunt Krynicki <zygmunt.krynicki@canonical.com> Wed, 22 Jul 2015 17:10:33 +0200
422+
423+plainbox-provider-checkbox (0.4-1) unstable; urgency=medium
424+
425+ * New upstream release. List of bugfixes:
426+ https://launchpad.net/plainbox-provider-checkbox/14.04/0.4
427+ * debian/watch: look for new releases on launchpad
428+ * debian/rules: stop using pybuild and use manage.py
429+ {i18n,build,install,validate} instead. This also drops dependency on
430+ python3-distutils-extra and replaces that with intltool
431+ * debian/control: drop X-Python3-Version
432+ * debian/control: make plainbox-provider-checkbox depend on python and
433+ python2.7 (for some scripts) rather than suggesting them.
434+ * debian/upstream/signing-key.asc: Use armoured gpg keys to avoid having to
435+ keep binary files in Debian packaging. Also, replace that with my key
436+ since I made the 0.3 release upstream.
437+ * debian/source/lintian-overrides: add an override for warning about no
438+ source for flash movie with reference to a bug report that discusses that
439+ issue.
440+ * debian/source/include-binaries: drop (no longer needed)
441+ * debian/patches: drop (no longer needed)
442+ * debian/plainbox-provider-checkbox.lintian-overrides: drop (no longer
443+ needed)
444+ * Stop being a python3 module, move to from DPMT to PAPT
445+
446+ -- Zygmunt Krynicki <zygmunt.krynicki@canonical.com> Mon, 07 Apr 2014 19:00:31 +0200
447+
448+plainbox-provider-checkbox (0.3-2) unstable; urgency=low
449+
450+ * Patch the checkbox.provider file to add the version number, required by
451+ plainbox >= 0.5.
452+
453+ -- Sylvain Pineau <sylvain.pineau@canonical.com> Tue, 28 Jan 2014 13:20:39 +0100
454+
455+plainbox-provider-checkbox (0.3-1) unstable; urgency=low
456+
457+ * Initial release (Closes: #735208)
458+
459+ -- Sylvain Pineau <sylvain.pineau@canonical.com> Wed, 22 Jan 2014 00:58:42 +0100
460diff --git a/debian/compat b/debian/compat
461new file mode 100644
462index 0000000..ec63514
463--- /dev/null
464+++ b/debian/compat
465@@ -0,0 +1 @@
466+9
467diff --git a/debian/control b/debian/control
468new file mode 100644
469index 0000000..a8a7306
470--- /dev/null
471+++ b/debian/control
472@@ -0,0 +1,68 @@
473+Source: plainbox-provider-checkbox
474+Section: utils
475+Priority: optional
476+Maintainer: Checkbox Developers <checkbox-devel@lists.ubuntu.com>
477+Uploaders: Sylvain Pineau <sylvain.pineau@canonical.com>,
478+ Zygmunt Krynicki <zygmunt.krynicki@canonical.com>,
479+ Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
480+Build-Depends: debhelper (>= 9),
481+ intltool,
482+ libasound2-dev,
483+ plainbox-provider-resource-generic (>= 0.25),
484+ python3,
485+ python3-checkbox-support (>= 0.25),
486+ python3-checkbox-ng,
487+ python3-debian
488+Standards-Version: 3.9.6
489+Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/plainbox-provider-checkbox/trunk/
490+Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/plainbox-provider-checkbox/trunk/
491+Homepage: http://launchpad.net/plainbox-provider-checkbox
492+
493+Package: plainbox-provider-checkbox
494+Architecture: any
495+Depends: plainbox-provider-resource-generic (>= 0.25),
496+ python3,
497+ python3-checkbox-support (>= 0.25),
498+ ${misc:Depends},
499+ ${plainbox:Depends},
500+ ${shlibs:Depends}
501+Recommends: bonnie++,
502+ curl,
503+ ethtool,
504+ gir1.2-cheese-3.0,
505+ gir1.2-gst-plugins-base-1.0,
506+ gir1.2-gstreamer-1.0,
507+ gstreamer1.0-plugins-good,
508+ gstreamer1.0-pulseaudio,
509+ hdparm,
510+ kmod,
511+ libgstreamer1.0-0,
512+ lshw,
513+ pm-utils,
514+ python3-apt,
515+ python3-dbus,
516+ python3-gi,
517+ smartmontools,
518+ sysstat,
519+ ${plainbox:Recommends}
520+Suggests: fswebcam,
521+ fwts,
522+ glmark2,
523+ glmark2-es2,
524+ gtkperf,
525+ imagemagick,
526+ mesa-utils,
527+ obexftp,
528+ render-bench,
529+ stress,
530+ wmctrl,
531+ ${plainbox:Suggests}
532+X-Plainbox-Provider: yes
533+Description: CheckBox provider for PlainBox
534+ This package provides the CheckBox jobs collection, i.e the hardware test
535+ definitions and scripts originally included with CheckBox.
536+ It is used together alongside with PlainBox.
537+ .
538+ Jobs are smallest units of testing that can be performed by PlainBox.
539+ All jobs have an unique name. There are many types of jobs, some are fully
540+ automated others are fully manual.
541diff --git a/debian/copyright b/debian/copyright
542new file mode 100644
543index 0000000..5d95625
544--- /dev/null
545+++ b/debian/copyright
546@@ -0,0 +1,96 @@
547+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
548+Upstream-Name: plainbox-provider-checkbox
549+Source: https://launchpad.net/checkbox
550+
551+Files: *
552+Copyright: Copyright 2007-2016 Canonical Ltd.
553+License: GPL-3
554+
555+Files: bin/alsa_info
556+Copyright: Copyright (C) 2007 Free Software Foundation.
557+License: GPL-2
558+
559+Files: bin/camera_test
560+Copyright:
561+ Copyright 2008-2012 Canonical Ltd.
562+ .
563+ The v4l2 ioctl code comes from the Python bindings for the v4l2
564+ userspace api (http://pypi.python.org/pypi/v4l2):
565+ Copyright (C) 1999-2009 the contributors
566+ .
567+ The JPEG metadata parser is a part of bfg-pages:
568+ https://github.com/yphus/bfg-pages/blob/master/pages/getimageinfo.py
569+ Copyright (C) Tim Hoffman
570+License: GPL-3
571+
572+Files: bin/graphics_driver
573+Copyright: Copyright (C) 2010-2012 Bryce W. Harrington All Rights Reserved.
574+License: MIT
575+ Permission is hereby granted, free of charge, to any person obtaining a copy
576+ of this software and associated documentation files (the "Software"), to deal
577+ in the Software without restriction, including without limitation the rights
578+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
579+ copies of the Software, and to permit persons to whom the Software is
580+ furnished to do so, subject to the following conditions:
581+ .
582+ The above copyright notice and this permission notice shall be included in
583+ all copies or substantial portions of the Software.
584+ .
585+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
586+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
587+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
588+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
589+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
590+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
591+ THE SOFTWARE.
592+
593+Files: bin/mm-test
594+Copyright:
595+ Copyright (C) 2008 Novell, Inc.
596+ Copyright (C) 2009 Red Hat, Inc.
597+License: GPL-2
598+
599+Files: src/threaded_memtest.c
600+Copyright: Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
601+License: GPL-2
602+
603+Files: bin/disk_info
604+Copyright:
605+ Copyright (C) 2010-2013 by Cloud Computing Center for Mobile Applications
606+ Industrial Technology Research Institute
607+License: GPL-3
608+
609+License: GPL-2
610+ This program is free software; you can redistribute it and/or modify
611+ it under the terms of the GNU General Public License as published by
612+ the Free Software Foundation; either version 2 of the License, or
613+ (at your option) any later version.
614+ .
615+ This program is distributed in the hope that it will be useful,
616+ but WITHOUT ANY WARRANTY; without even the implied warranty of
617+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
618+ GNU General Public License for more details.
619+ .
620+ You should have received a copy of the GNU General Public License
621+ along with this program; if not, write to the Free Software
622+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
623+ .
624+ On Debian-based systems the full text of the GPL, version 2, can be found at
625+ /usr/share/common-licenses/GPL-2.
626+
627+License: GPL-3
628+ This program is free software: you can redistribute it and/or modify
629+ it under the terms of the GNU General Public License version 3,
630+ as published by the Free Software Foundation.
631+ .
632+ This program is distributed in the hope that it will be useful,
633+ but WITHOUT ANY WARRANTY; without even the implied warranty of
634+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
635+ GNU General Public License for more details.
636+ .
637+ You should have received a copy of the GNU General Public License
638+ along with this program. If not, see <http://www.gnu.org/licenses/>.
639+ .
640+ On Debian-based systems the full text of the GPL, version 3, can be found at
641+ /usr/share/common-licenses/GPL-3.
642+
643diff --git a/debian/rules b/debian/rules
644new file mode 100755
645index 0000000..85fafe2
646--- /dev/null
647+++ b/debian/rules
648@@ -0,0 +1,23 @@
649+#!/usr/bin/make -f
650+
651+%:
652+ dh $@
653+
654+override_dh_auto_clean:
655+ python3 manage.py clean
656+
657+override_dh_auto_build:
658+ python3 manage.py build
659+ python3 manage.py i18n --dont-update-pot --dont-merge-po
660+
661+override_dh_auto_test:
662+ python3 manage.py validate --loose --legacy
663+
664+override_dh_auto_install:
665+ python3 manage.py install \
666+ --prefix=/usr --layout=unix \
667+ --root=$(CURDIR)/debian/plainbox-provider-checkbox/
668+
669+override_dh_gencontrol:
670+ python3 manage.py packaging
671+ dh_gencontrol
672diff --git a/debian/source/format b/debian/source/format
673new file mode 100644
674index 0000000..163aaf8
675--- /dev/null
676+++ b/debian/source/format
677@@ -0,0 +1 @@
678+3.0 (quilt)
679diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
680new file mode 100644
681index 0000000..f031478
682--- /dev/null
683+++ b/debian/source/lintian-overrides
684@@ -0,0 +1,2 @@
685+# https://bugs.launchpad.net/plainbox-provider-checkbox/+bug/1303919
686+plainbox-provider-checkbox source: source-is-missing
687diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
688new file mode 100644
689index 0000000..90eb450
690--- /dev/null
691+++ b/debian/upstream/signing-key.asc
692@@ -0,0 +1,119 @@
693+-----BEGIN PGP PUBLIC KEY BLOCK-----
694+Version: GnuPG v1
695+
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
732+xxGS57/Nmfbij8UuxgkLtw==
733+=4Jty
734+-----END PGP PUBLIC KEY BLOCK-----
735+-----BEGIN PGP PUBLIC KEY BLOCK-----
736+Version: GnuPG v1
737+
738+mQENBEvipr4BCADJdK7pAu7fEFyNCLdMULze97sVWWJ1bWkA/lMot14911EbyFr7
739+pvi5uril4QT55d1AKfMXJ6HNtHtIHe/CF1ehEc5c7oA2c0IdeSR4F6JEbFSneORT
740+OZtYAK3VdG53ywpyCqP2tzB/YrRhVO9qsc5fYEr0EpeqRkvB5ower2MUFvvM5PBZ
741+a+0owzW9OnlSOqbrVPj9Wp1bn857j/WpJCrMbcJlPPWGyo4ambAQI4Rky+apeQM0
742+L4QTjPMXIoHDQao/2XsSL75OBx5Bi81j1KoU56PvM9b4oWMOqDDolPHwZGJtCewl
743+LJqfy1Oa68vN4MxDXFmGp7bFTCt8ZOup1AjlABEBAAG0LVN5bHZhaW4gUGluZWF1
744+IDxzeWx2YWluLnBpbmVhdUBjYW5vbmljYWwuY29tPokBOAQTAQIAIgUCS+KmvgIb
745+AwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQdNV1zH7XLNGSgAgApgU9VUlp
746+Rblw7WH7q8BueI4G5CRiIDt6PA866IhbtuKPHMhv8LUQCVavAtKWVlwx/wGS/+2y
747+CKqTCRXFu52MomE+kSfEFnELMW8vwz3KG6NgUVIv8dFesf1Finc8Y9YQkUX/xWYV
748+MYREz3rgDgGMgpWlMVq5/olqYMg1jc4yIKrbQGoFDvlgijzGwibh/V5NVPcuYrMK
749+DvhnWGIEX4whP/hW/o7vPKC5qYznrGqRroLqsq1viGgeS7nK37vcgX+vYv5pzIDM
750+73CqpAnISAyBpU5n/YHG4AmundrVHwdscY7u8l9Fn5XFEGhu6FxWQL2mAY/gvGPS
751+fgxeZUWpB21WNrkBDQRL4qa+AQgAtAiq2zDF0hl2KnB/a16O5SyjDR5XJUcWJ9F/
752+tFw0i3EXEYeYdCFHaTdFfDmdX+SyBPh4lJIJZCpFZZ7Akeb3qLDS/4oAAo4EcoeS
753+pp47Mr1/eCahI9Pkwg073jqHSUAKQp6oPP/bvBzAqhl4ZkUyZQpjdy0/d5FO4OEa
754+R91SCxNqBQOA+Z2rKL6gBwJYpMGMKC1bhfOCvD8eH7dN3PDMNnHoYSjJSy5di/Zu
755+snrVR4MO63FpmSZ4r5eGjIaiBFxYXsitn2ilPOt2e0/Vo8QOJsOl+6bOkdn5jiNL
756+n1fCvzadUXuEDTjj9+6UkCCLYRODeTrMM9XpNeAZZBSGVzuCgQARAQABiQEfBBgB
757+AgAJBQJL4qa+AhsMAAoJEHTVdcx+1yzRcpEH/iZMQPFnnCj3LthOvCAVM/raO17h
758+KshdrOMS53uI5NzeBnr+/0zGMehnYcpzLmrvHXM86lsUVSzfr/px/Ve3+8SR6qxy
759+p5+PFsxbqh+DSkxnTfbIqHVBY4f7/nOQavI1rhj4JQzKiYLCvIhDMVQm/2ZKnsNB
760+043MaDPi0SBLJmqZqFyH3CUE3B8JNi4i+nv7Vj37V4sL1yHwN+rmyDhZUUelO5Iw
761+vrysE7eNqmhTtuV+tl5Oq2EEzYau+7u+/Kuo1JpFsamJ8xVIR2j9i/3m3LqOaVPo
762+ExFTDCQAPTaRyLAvTFylsIUffsdIAsM8wJQnuO5EzlxbkId3aVOrJ/cb5to=
763+=cQg/
764+-----END PGP PUBLIC KEY BLOCK-----
765+-----BEGIN PGP PUBLIC KEY BLOCK-----
766+Version: SKS 1.1.5
767+
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
809+FHU=
810+=UsyP
811+-----END PGP PUBLIC KEY BLOCK-----
812diff --git a/debian/watch b/debian/watch
813new file mode 100644
814index 0000000..f151ff1
815--- /dev/null
816+++ b/debian/watch
817@@ -0,0 +1,4 @@
818+version=3
819+opts=pgpsigurlmangle=s/$/.asc/ \
820+ http://launchpad.net/plainbox-provider-checkbox/+download/ \
821+ https://launchpad\.net/plainbox-provider-checkbox/.*/.*/\+download/plainbox-provider-checkbox-(.*).tar.gz
822diff --git a/manage.py b/manage.py
823index d404260..9329248 100755
824--- a/manage.py
825+++ b/manage.py
826@@ -5,7 +5,11 @@ from plainbox.provider_manager import N_
827 setup(
828 name='plainbox-provider-checkbox',
829 namespace='com.canonical.certification',
830+<<<<<<< manage.py
831 version="0.60.0.dev0",
832+=======
833+ version="0.59.0",
834+>>>>>>> manage.py
835 description=N_("Checkbox provider"),
836 gettext_domain='plainbox-provider-checkbox',
837 strict=False, deprecated=False,
838diff --git a/units/bluetooth/jobs.pxu b/units/bluetooth/jobs.pxu
839index e1573b5..2fb5b44 100644
840--- a/units/bluetooth/jobs.pxu
841+++ b/units/bluetooth/jobs.pxu
842@@ -4,7 +4,11 @@ category_id: com.canonical.plainbox::bluetooth
843 _summary: Make sure at least one bluetooth device is detected
844 plugin: shell
845 command:
846+<<<<<<< units/bluetooth/jobs.pxu
847 bt_list_adapters.py && udev_resource.py -f BLUETOOTH
848+=======
849+ bt_list_adapters.py
850+>>>>>>> units/bluetooth/jobs.pxu
851 estimated_duration: 2s
852 flags: preserve-locale
853 requires: manifest.has_bt_adapter
854diff --git a/units/cpu/test-plan.pxu b/units/cpu/test-plan.pxu
855index f649267..cd12c7b 100644
856--- a/units/cpu/test-plan.pxu
857+++ b/units/cpu/test-plan.pxu
858@@ -14,6 +14,12 @@ _name: CPU tests (Manual)
859 _description:
860 CPU tests (Manual)
861 include:
862+<<<<<<< units/cpu/test-plan.pxu
863+=======
864+nested_part:
865+ cpu-cert-automated
866+
867+>>>>>>> units/cpu/test-plan.pxu
868
869 id: cpu-cert-automated
870 unit: test plan
871diff --git a/units/ethernet/test-plan.pxu b/units/ethernet/test-plan.pxu
872index 8f4fac6..381429a 100644
873--- a/units/ethernet/test-plan.pxu
874+++ b/units/ethernet/test-plan.pxu
875@@ -1,3 +1,4 @@
876+<<<<<<< units/ethernet/test-plan.pxu
877 id: ethernet-cert-full
878 unit: test plan
879 _name: Ethernet tests
880@@ -33,6 +34,8 @@ include:
881 bootstrap_include:
882 device
883
884+=======
885+>>>>>>> units/ethernet/test-plan.pxu
886 id: ethernet-full
887 unit: test plan
888 _name: QA tests for ethernet
889diff --git a/units/fingerprint/test-plan.pxu b/units/fingerprint/test-plan.pxu
890index ed5ee9a..69ed46d 100644
891--- a/units/fingerprint/test-plan.pxu
892+++ b/units/fingerprint/test-plan.pxu
893@@ -1,16 +1,27 @@
894 id: fingerprint-full
895 unit: test plan
896+<<<<<<< units/fingerprint/test-plan.pxu
897 _name: QA tests for Fingerprint reader
898+=======
899+_name: QA tests for fingerprint reader
900+>>>>>>> units/fingerprint/test-plan.pxu
901 _description: Fingerprint tests
902 estimated_duration: 1m
903 include:
904 nested_part:
905 fingerprint-manual
906+<<<<<<< units/fingerprint/test-plan.pxu
907 fingerprint-automated
908
909 id: fingerprint-manual
910 unit: test plan
911 _name: Fingerprint reader tests (Manual)
912+=======
913+
914+id: fingerprint-manual
915+unit: test plan
916+_name: Manual fingerprint tests
917+>>>>>>> units/fingerprint/test-plan.pxu
918 _description: Manual tests for fingerprint reader
919 include:
920 fingerprint/detect certification-status=non-blocker
921@@ -19,9 +30,12 @@ include:
922 fingerprint/verify-match certification-status=non-blocker
923 fingerprint/unlock certification-status=non-blocker
924 fingerprint/delete certification-status=non-blocker
925+<<<<<<< units/fingerprint/test-plan.pxu
926
927 id: fingerprint-automated
928 unit: test plan
929 _name: Fingerprint reader tests (Automated)
930 _description: Autoamted tests for fingerprint reader
931 include:
932+=======
933+>>>>>>> units/fingerprint/test-plan.pxu
934diff --git a/units/gpio/test-plan.pxu b/units/gpio/test-plan.pxu
935index 91d83b5..c1ffee1 100644
936--- a/units/gpio/test-plan.pxu
937+++ b/units/gpio/test-plan.pxu
938@@ -25,7 +25,10 @@ _name: Automated GPIO tests
939 _description: Automated GPIO tests for Ubuntu Core devices
940 bootstrap_include:
941 model_assertion
942+<<<<<<< units/gpio/test-plan.pxu
943 dmi
944+=======
945+>>>>>>> units/gpio/test-plan.pxu
946 include:
947 gpio/sysfs_loopback_pairs_.*
948 gpio/gpiomem_loopback_pairs_.*
949diff --git a/units/info/jobs.pxu b/units/info/jobs.pxu
950index 12d7ab1..ae8beb4 100644
951--- a/units/info/jobs.pxu
952+++ b/units/info/jobs.pxu
953@@ -454,11 +454,15 @@ category_id: com.canonical.plainbox::info
954 id: info/systemd-analyze
955 estimated_duration: 0.2
956 _summary: System boot-up performance statistics
957+<<<<<<< units/info/jobs.pxu
958 command:
959 # Wait for boot to complete
960 # https://github.com/systemd/systemd/pull/9796
961 timeout 60 systemctl is-system-running --wait > /dev/null
962 systemd-analyze
963+=======
964+command: systemd-analyze
965+>>>>>>> units/info/jobs.pxu
966
967 id: lstopo_verbose_attachment
968 plugin: attachment
969diff --git a/units/led/test-plan.pxu b/units/led/test-plan.pxu
970index b0d0129..e0ecd2a 100644
971--- a/units/led/test-plan.pxu
972+++ b/units/led/test-plan.pxu
973@@ -115,7 +115,12 @@ include:
974 led/bluetooth
975 led/serial
976 led/fn
977+<<<<<<< units/led/test-plan.pxu
978 led/sysfs_led_brightness_on_.*
979 led/sysfs_led_brightness_off_.*
980 bootstrap_include:
981 dmi
982+=======
983+
984+
985+>>>>>>> units/led/test-plan.pxu
986diff --git a/units/miscellanea/test-plan.pxu b/units/miscellanea/test-plan.pxu
987index 92f8019..c86991b 100644
988--- a/units/miscellanea/test-plan.pxu
989+++ b/units/miscellanea/test-plan.pxu
990@@ -15,6 +15,10 @@ _description:
991 Miscellaneous client tests (fwts, dmi, oops) (Manual)
992 include:
993 nested_part:
994+<<<<<<< units/miscellanea/test-plan.pxu
995+=======
996+ misc-client-cert-automated
997+>>>>>>> units/miscellanea/test-plan.pxu
998
999
1000 id: misc-client-cert-automated
1001@@ -84,6 +88,10 @@ _description:
1002 mandatory_include:
1003 miscellanea/submission-resources
1004 miscellanea/cpuid
1005+<<<<<<< units/miscellanea/test-plan.pxu
1006+=======
1007+ miscellanea/efi_boot_mode certification-status=blocker
1008+>>>>>>> units/miscellanea/test-plan.pxu
1009 miscellanea/ipmi_test certification-status=blocker
1010 miscellanea/bmc_info
1011 miscellanea/dmitest_server
1012diff --git a/units/mobilebroadband/test-plan.pxu b/units/mobilebroadband/test-plan.pxu
1013index dc5ded9..e4e9c8b 100644
1014--- a/units/mobilebroadband/test-plan.pxu
1015+++ b/units/mobilebroadband/test-plan.pxu
1016@@ -14,6 +14,12 @@ _name: Mobile broadband tests (Manual)
1017 _description:
1018 Mobile broadband tests (Manual)
1019 include:
1020+<<<<<<< units/mobilebroadband/test-plan.pxu
1021+=======
1022+nested_part:
1023+ mobilebroadband-cert-automated
1024+
1025+>>>>>>> units/mobilebroadband/test-plan.pxu
1026
1027 id: mobilebroadband-cert-automated
1028 unit: test plan
1029diff --git a/units/networking/test-plan.pxu b/units/networking/test-plan.pxu
1030index c00504f..49518fa 100644
1031--- a/units/networking/test-plan.pxu
1032+++ b/units/networking/test-plan.pxu
1033@@ -13,6 +13,10 @@ _name: Networking tests (manual)
1034 _description: Networking tests (manual)
1035 include:
1036 networking/info_device.* certification-status=blocker
1037+<<<<<<< units/networking/test-plan.pxu
1038+=======
1039+ ethernet/hotplug-.* certification-status=blocker
1040+>>>>>>> units/networking/test-plan.pxu
1041 bootstrap_include:
1042 device
1043
1044@@ -21,6 +25,10 @@ unit: test plan
1045 _name: Networking tests (automated)
1046 _description: Networking tests (automated)
1047 include:
1048+<<<<<<< units/networking/test-plan.pxu
1049+=======
1050+ ethernet/detect certification-status=blocker
1051+>>>>>>> units/networking/test-plan.pxu
1052 networking/gateway_ping certification-status=blocker
1053 networking/ntp certification-status=blocker
1054
1055@@ -29,9 +37,17 @@ unit: test plan
1056 _name: Networking tests (certification blockers only)
1057 _description: Networking tests (certification blockers only)
1058 include:
1059+<<<<<<< units/networking/test-plan.pxu
1060 networking/gateway_ping certification-status=blocker
1061 networking/info_device.* certification-status=blocker
1062 networking/ntp certification-status=blocker
1063+=======
1064+ ethernet/detect certification-status=blocker
1065+ networking/gateway_ping certification-status=blocker
1066+ networking/info_device.* certification-status=blocker
1067+ networking/ntp certification-status=blocker
1068+ ethernet/hotplug-.* certification-status=blocker
1069+>>>>>>> units/networking/test-plan.pxu
1070 bootstrap_include:
1071 device
1072
1073diff --git a/units/power-management/test-plan.pxu b/units/power-management/test-plan.pxu
1074index 40e5dc1..3a176bd 100644
1075--- a/units/power-management/test-plan.pxu
1076+++ b/units/power-management/test-plan.pxu
1077@@ -1,18 +1,29 @@
1078+<<<<<<< units/power-management/test-plan.pxu
1079 id: power-management-precheck-cert-full
1080+=======
1081+id: power-management-precheck-cert
1082+>>>>>>> units/power-management/test-plan.pxu
1083 unit: test plan
1084 _name: Power Management precheck tests
1085 _description: Power Management precheck tests
1086 include:
1087 nested_part:
1088+<<<<<<< units/power-management/test-plan.pxu
1089 power-management-precheck-cert-manual
1090 power-management-precheck-cert-automated
1091
1092 id: power-management-reboot-poweroff-cert-full
1093+=======
1094+ power-management-precheck-cert-automated
1095+
1096+id: power-management-reboot-poweroff-cert
1097+>>>>>>> units/power-management/test-plan.pxu
1098 unit: test plan
1099 _name: Power Management reboot and power off tests
1100 _description: Power Management reboot and power off tests
1101 include:
1102 nested_part:
1103+<<<<<<< units/power-management/test-plan.pxu
1104 power-management-reboot-poweroff-cert-manual
1105 power-management-reboot-poweroff-cert-automated
1106
1107@@ -22,6 +33,10 @@ _name: Power Management precheck tests (Manual)
1108 _description: Power Management precheck tests (Manual)
1109 include:
1110
1111+=======
1112+ power-management-reboot-poweroff-cert-automated
1113+
1114+>>>>>>> units/power-management/test-plan.pxu
1115 id: power-management-precheck-cert-automated
1116 unit: test plan
1117 _name: Power Management precheck tests (automated)
1118@@ -32,12 +47,15 @@ include:
1119 power-management/fwts_wakealarm certification-status=blocker
1120 power-management/fwts_wakealarm-log-attach
1121
1122+<<<<<<< units/power-management/test-plan.pxu
1123 id: power-management-reboot-poweroff-cert-manual
1124 unit: test plan
1125 _name: Power Management reboot and power off tests (Manual
1126 _description: Power Management reboot and power off tests (Manual)
1127 include:
1128
1129+=======
1130+>>>>>>> units/power-management/test-plan.pxu
1131 id: power-management-reboot-poweroff-cert-automated
1132 unit: test plan
1133 _name: Power Management reboot and power off tests (automated)
1134diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu
1135index cc5414d..7c4a547 100644
1136--- a/units/suspend/suspend.pxu
1137+++ b/units/suspend/suspend.pxu
1138@@ -263,7 +263,11 @@ _summary: Automated test of suspend function
1139 _description:
1140 This is the automated version of suspend/suspend_advanced.
1141 user: root
1142+<<<<<<< units/suspend/suspend.pxu
1143 environ: PLAINBOX_SESSION_SHARE RTC_DEVICE_FILE
1144+=======
1145+environ: PLAINBOX_SESSION_SHARE
1146+>>>>>>> units/suspend/suspend.pxu
1147 command:
1148 if [[ -v SNAP ]]; then
1149 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/usr/lib/fwts"
1150@@ -274,11 +278,15 @@ command:
1151 set -o pipefail; checkbox-support-fwts_test -f none -l "$PLAINBOX_SESSION_SHARE"/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee "$PLAINBOX_SESSION_SHARE"/suspend_single_times.log
1152 else
1153 echo "Calling rtcwake"
1154+<<<<<<< units/suspend/suspend.pxu
1155 if [ -z "$RTC_DEVICE_FILE" ]; then
1156 rtcwake -m mem -s 30
1157 else
1158 rtcwake -d "$RTC_DEVICE_FILE" -m mem -s 30
1159 fi
1160+=======
1161+ rtcwake -m mem -s 30
1162+>>>>>>> units/suspend/suspend.pxu
1163 fi
1164 estimated_duration: 90.000
1165
1166diff --git a/units/ubuntucore/jobs.pxu b/units/ubuntucore/jobs.pxu
1167index 04c30b3..90e8d2f 100644
1168--- a/units/ubuntucore/jobs.pxu
1169+++ b/units/ubuntucore/jobs.pxu
1170@@ -65,7 +65,11 @@ _steps:
1171 {% endif -%}
1172 1. Check the current revision of core{{release}}
1173 $ snap list core{{release}}
1174+<<<<<<< units/ubuntucore/jobs.pxu
1175 2. Update to edge.
1176+=======
1177+ 2. Update to edge.
1178+>>>>>>> units/ubuntucore/jobs.pxu
1179 Note that system will automatically reboot in 1 minute after doing this command.
1180 Please execute the command in step 3 in 1 minute to stop the automatic reboot.
1181 $ sudo snap refresh core{{release}} --edge
1182@@ -98,7 +102,11 @@ _steps:
1183 {% endif -%}
1184 1. Check the current revision of core{{release}}
1185 $ snap list core{{release}}
1186+<<<<<<< units/ubuntucore/jobs.pxu
1187 2. Update to edge.
1188+=======
1189+ 2. Update to edge.
1190+>>>>>>> units/ubuntucore/jobs.pxu
1191 Note that system will automatically reboot in 1 minute after doing this command.
1192 Please execute the command in step 3 in 1 minute to stop the automatic reboot.
1193 $ sudo snap refresh core{{release}} --edge --ignore-validation
1194@@ -129,6 +137,7 @@ _verification:
1195 plugin: manual
1196 category_id: ubuntucore
1197 estimated_duration: 120
1198+<<<<<<< units/ubuntucore/jobs.pxu
1199
1200 unit: template
1201 template-resource: model_assertion
1202@@ -152,3 +161,5 @@ _verification:
1203 Check if system could boot, and kernel version is the one before switched to
1204 "failboot" kernel
1205 category_id: ubuntucore
1206+=======
1207+>>>>>>> units/ubuntucore/jobs.pxu
1208diff --git a/units/watchdog/jobs.pxu b/units/watchdog/jobs.pxu
1209index c2bd868..4b9fa79 100644
1210--- a/units/watchdog/jobs.pxu
1211+++ b/units/watchdog/jobs.pxu
1212@@ -9,7 +9,36 @@ command: udev_resource.py -f WATCHDOG
1213 id: watchdog/systemd-config
1214 _summary: Check if the hardware watchdog is properly configured
1215 template-engine: jinja2
1216+<<<<<<< units/watchdog/jobs.pxu
1217 command: watchdog_config_test.py
1218+=======
1219+command:
1220+ inbuilt=$(systemctl show -p RuntimeWatchdogUSec | awk -F= '{print $2}')
1221+ external=$(systemctl is-active watchdog.service)
1222+ {%- if __on_ubuntucore__ %}
1223+ if [ "$inbuilt" == "0" ]; then
1224+ echo "systemd watchdog should be enabled but reset timeout: $inbuilt"
1225+ exit 1
1226+ fi
1227+ if [ "$external" == "active" ]; then
1228+ echo "found unexpected active watchdog.service unit"
1229+ exit 1
1230+ fi
1231+ echo "systemd watchdog enabled, reset timeout: $inbuilt"
1232+ echo "watchdog.service is not active"
1233+ {%- else %}
1234+ if [ "$inbuilt" != "0" ]; then
1235+ echo "systemd watchdog should not be enabled but reset timeout: $inbuilt"
1236+ exit 1
1237+ fi
1238+ if [ "$external" != "active" ]; then
1239+ echo "watchdog.service unit does not report as active"
1240+ exit 1
1241+ fi
1242+ echo "systemd watchdog disabled"
1243+ echo "watchdog.service active"
1244+ {% endif -%}
1245+>>>>>>> units/watchdog/jobs.pxu
1246 category_id: com.canonical.plainbox::power-management
1247 flags: simple
1248 imports: from com.canonical.plainbox import manifest
1249diff --git a/units/wireless/jobs.pxu b/units/wireless/jobs.pxu
1250index 95ddf31..c859702 100644
1251--- a/units/wireless/jobs.pxu
1252+++ b/units/wireless/jobs.pxu
1253@@ -551,6 +551,7 @@ command:
1254 estimated_duration: 2.0
1255 depends: wireless/nm_connection_save_{interface}
1256 flags: preserve-locale also-after-suspend also-after-suspend-manual
1257+<<<<<<< units/wireless/jobs.pxu
1258
1259 unit: template
1260 template-resource: device
1261@@ -563,3 +564,5 @@ category_id: com.canonical.plainbox::wireless
1262 estimated_duration: 30.0
1263 flags: preserve-locale also-after-suspend
1264 requires: package.name == 'systemd'
1265+=======
1266+>>>>>>> units/wireless/jobs.pxu
1267diff --git a/units/wireless/test-plan.pxu b/units/wireless/test-plan.pxu
1268index d0458cc..2d8bf7b 100644
1269--- a/units/wireless/test-plan.pxu
1270+++ b/units/wireless/test-plan.pxu
1271@@ -14,6 +14,12 @@ _name: Wireless tests (Manual)
1272 _description:
1273 Wireless connection tests (Manual)
1274 include:
1275+<<<<<<< units/wireless/test-plan.pxu
1276+=======
1277+nested_part:
1278+ wireless-cert-automated
1279+
1280+>>>>>>> units/wireless/test-plan.pxu
1281
1282 id: after-suspend-wireless-cert-full
1283 unit: test plan
1284@@ -41,7 +47,10 @@ include:
1285 wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker
1286 wireless/wireless_connection_open_ax_nm_.* certification-status=blocker
1287 wireless/nm_connection_restore_.*
1288+<<<<<<< units/wireless/test-plan.pxu
1289 wireless/check_iwlwifi_microcode_crash_.*
1290+=======
1291+>>>>>>> units/wireless/test-plan.pxu
1292
1293 id: after-suspend-wireless-cert-automated
1294 unit: test plan
1295@@ -60,7 +69,10 @@ include:
1296 after-suspend-wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker
1297 after-suspend-wireless/wireless_connection_open_ax_nm_.* certification-status=blocker
1298 after-suspend-wireless/nm_connection_restore_.*
1299+<<<<<<< units/wireless/test-plan.pxu
1300 after-suspend-wireless/check_iwlwifi_microcode_crash_.*
1301+=======
1302+>>>>>>> units/wireless/test-plan.pxu
1303
1304 id: after-suspend-manual-wireless-cert-automated
1305 unit: test plan
1306@@ -159,7 +171,10 @@ include:
1307 wireless/wireless_connection_wpa_ac_np_.*
1308 wireless/wireless_connection_wpa_bg_np_.*
1309 wireless/wireless_connection_wpa_n_np_.*
1310+<<<<<<< units/wireless/test-plan.pxu
1311 wireless/check_iwlwifi_microcode_crash_.*
1312+=======
1313+>>>>>>> units/wireless/test-plan.pxu
1314 bootstrap_include:
1315 device
1316
1317@@ -357,7 +372,10 @@ include:
1318 after-suspend-wireless/wireless_connection_wpa_ac_np_.*
1319 after-suspend-wireless/wireless_connection_wpa_bg_np_.*
1320 after-suspend-wireless/wireless_connection_wpa_n_np_.*
1321+<<<<<<< units/wireless/test-plan.pxu
1322 after-suspend-wireless/check_iwlwifi_microcode_crash_.*
1323+=======
1324+>>>>>>> units/wireless/test-plan.pxu
1325 bootstrap_include:
1326 device
1327

Subscribers

People subscribed via source and target branches