1
diff --git a/bin/block_device_resource.py b/bin/block_device_resource.py
2
index 2ce9d29..ad6c5fb 100755
3
--- a/bin/block_device_resource.py
4
+++ b/bin/block_device_resource.py
5
@@ -33,7 +33,7 @@ def usb_support(name, version):
6
33
    path = rootdir_pattern.sub('', os.readlink('/sys/block/%s' % name))
33
    path = rootdir_pattern.sub('', os.readlink('/sys/block/%s' % name))
7
34
34
8
35
    # Remove the usb config.interface part of the path
35
    # Remove the usb config.interface part of the path
10
36
    m = re.match('((.*usb\d+).*\/)\d-[\d\.:\-]+\/.*', path)
36
    m = re.match('((.*usb\d+).*\/)\d-[\d\.:\-]+\/.*', path)  # noqa: W605
11
37
    if m:
37
    if m:
12
38
        device_path = m.group(1)
38
        device_path = m.group(1)
13
39
        hub_port_path = m.group(2)
39
        hub_port_path = m.group(2)
14
@@ -137,8 +137,9 @@ def smart_support(name):
15
137
                    break
137
                    break
16
138
    return supported
138
    return supported
17
139
139
18
140
19
140
for path in glob('/sys/block/*/device') + glob('/sys/block/*/dm'):
141
for path in glob('/sys/block/*/device') + glob('/sys/block/*/dm'):
21
141
    name = re.sub('.*/(.*?)/(device|dm)', '\g<1>', path)
142
    name = re.sub('.*/(.*?)/(device|dm)', '\g<1>', path)  # noqa: W605
22
142
    state = device_state(name)
143
    state = device_state(name)
23
143
    usb2 = usb_support(name, 2.00)
144
    usb2 = usb_support(name, 2.00)
24
144
    usb3 = usb_support(name, 3.00)
145
    usb3 = usb_support(name, 3.00)
25
diff --git a/bin/cpuinfo_resource.py b/bin/cpuinfo_resource.py
26
index d00eeab..31e8b63 100755
27
--- a/bin/cpuinfo_resource.py
28
+++ b/bin/cpuinfo_resource.py
29
@@ -29,7 +29,9 @@ CPUINFO_FILENAME = "/proc/cpuinfo"
30
29
FREQUENCY_FILENAME = "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq"
29
FREQUENCY_FILENAME = "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq"
31
30
30
32
31
# Filename where available frequency governors are stored.
31
# Filename where available frequency governors are stored.
34
32
GOVERNORS_FILENAME = "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors"
32
GOVERNORS_FILENAME = (
35
33
    "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors")
36
34
37
33
35
38
34
class CpuinfoResult:
36
class CpuinfoResult:
39
35
37
40
diff --git a/bin/efi_resource.py b/bin/efi_resource.py
41
index 2f53720..fa1e270 100755
42
--- a/bin/efi_resource.py
43
+++ b/bin/efi_resource.py
44
@@ -24,7 +24,8 @@ from checkbox_support.parsers.efi import EfiParser
45
24
24
46
25
25
47
26
# Command to retrieve efi information.
26
# Command to retrieve efi information.
49
27
COMMAND = "[ -d /sys/firmware/efi ] && cat /var/log/kern.log* | grep -m 1 -o --color=never 'EFI v.*' || true"
27
COMMAND = ("[ -d /sys/firmware/efi ] && cat /var/log/kern.log* | "
50
28
           "grep -m 1 -o --color=never 'EFI v.*' || true")
51
28
29
52
29
30
53
30
class EfiResult:
31
class EfiResult:
54
diff --git a/bin/graphics_card_resource.py b/bin/graphics_card_resource.py
55
index 110c5f4..edd3b3b 100755
56
--- a/bin/graphics_card_resource.py
57
+++ b/bin/graphics_card_resource.py
58
@@ -31,6 +31,7 @@ def slugify(_string):
59
31
        "-_.{}{}".format(string.ascii_letters, string.digits))
31
        "-_.{}{}".format(string.ascii_letters, string.digits))
60
32
    return ''.join(c if c in valid_chars else '_' for c in _string)
32
    return ''.join(c if c in valid_chars else '_' for c in _string)
61
33
33
62
34
63
34
def subprocess_lines_generator(command):
35
def subprocess_lines_generator(command):
64
35
    """
36
    """
65
36
    Generator that opens a subprocess and spits out lines
37
    Generator that opens a subprocess and spits out lines
66
@@ -118,8 +119,9 @@ def main():
67
118
119
68
119
    # udev_devices generates one dict per device, the list shown
120
    # udev_devices generates one dict per device, the list shown
69
120
    # below filters that to only VIDEO ones
121
    # below filters that to only VIDEO ones
72
121
    video_devices = list(r for r in udev_devices(udev_output)
122
    video_devices = list(
73
122
                               if r.get("category", "") == 'VIDEO')
123
        r for r in udev_devices(udev_output) if r.get(
74
124
            "category", "") == 'VIDEO')
75
123
    video_devices.sort(key=lambda r: bus_ordering(r))
125
    video_devices.sort(key=lambda r: bus_ordering(r))
76
124
126
77
125
    # commands needed to switch to and from particular GPU,
127
    # commands needed to switch to and from particular GPU,
78
@@ -188,5 +190,6 @@ def main():
79
188
        raise SystemExit(err)
190
        raise SystemExit(err)
80
189
    return 0
191
    return 0
81
190
192
82
193
83
191
if __name__ == "__main__":
194
if __name__ == "__main__":
84
192
    raise SystemExit(main())
195
    raise SystemExit(main())
85
diff --git a/bin/lsb_resource.py b/bin/lsb_resource.py
86
index d33db78..297661e 100755
87
--- a/bin/lsb_resource.py
88
+++ b/bin/lsb_resource.py
89
@@ -20,8 +20,6 @@
90
20
import re
20
import re
91
21
import sys
21
import sys
92
22
22
93
23
from subprocess import Popen, PIPE
94
24
95
25
23
96
26
def get_lsb_release():
24
def get_lsb_release():
97
27
    lsb_release_map = {
25
    lsb_release_map = {
98
@@ -41,7 +39,7 @@ def get_lsb_release():
99
41
                    key = lsb_release_map[key]
39
                    key = lsb_release_map[key]
100
42
                    # Strip out quotes and newlines
40
                    # Strip out quotes and newlines
101
43
                    lsb_release[key] = re.sub('["\n]', '', value)
41
                    lsb_release[key] = re.sub('["\n]', '', value)
103
44
    except:
42
    except OSError:
104
45
        # Missing file or permissions? Return the default lsb_release
43
        # Missing file or permissions? Return the default lsb_release
105
46
        pass
44
        pass
106
47
45
107
diff --git a/bin/mobilebroadband_resource.sh b/bin/mobilebroadband_resource.sh
108
index 10e9adc..2220c5a 100755
109
--- a/bin/mobilebroadband_resource.sh
110
+++ b/bin/mobilebroadband_resource.sh
111
@@ -18,19 +18,16 @@
112
18
# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
18
# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
113
19
#
19
#
114
20
20
116
21
MMCLI_PATH=$(which mmcli)
21
MMCLI_PATH=$(command -v mmcli)
117
22
22
118
23
if [ -x "$MMCLI_PATH" ]; then
23
if [ -x "$MMCLI_PATH" ]; then
119
24
    # Use mmcli to query for modem capabilities
24
    # Use mmcli to query for modem capabilities
120
25
    for i in $(mmcli --simple-status -L 2>/dev/null || mmcli -L | \
25
    for i in $(mmcli --simple-status -L 2>/dev/null || mmcli -L | \
121
26
               awk '/freedesktop\/ModemManager1\/Modem/ {print $1;}'); do
26
               awk '/freedesktop\/ModemManager1\/Modem/ {print $1;}'); do
124
27
        mmcli -m $i |grep -q "supported: .*gsm-umts.*" && GSM=yes
27
        mmcli -m "$i" | grep -q "supported: .*gsm-umts.*" && GSM=yes
125
28
        mmcli -m $i |grep -q "supported: .*cdma.*" && CDMA=yes
28
        mmcli -m "$i" | grep -q "supported: .*cdma.*" && CDMA=yes
126
29
    done
29
    done
132
30
    # force final exit status to true in case the test fails,
30
    [ "$GSM" = "yes" ] && echo "gsm: supported"
133
31
    # as it's a resource and we don't want it to fail unless it
31
    [ "$CDMA" = "yes" ] && echo "cdma: supported"
129
32
    # really failed :D
130
33
    [ "$GSM" = "yes" ] && echo "gsm: supported" || true
131
34
    [ "$CDMA" = "yes" ] && echo "cdma: supported" || true
134
35
fi
32
fi
136
36
33
exit 0
137
diff --git a/bin/module_resource.py b/bin/module_resource.py
138
index 8f3f53d..43d15a0 100755
139
--- a/bin/module_resource.py
140
+++ b/bin/module_resource.py
141
@@ -69,5 +69,6 @@ def main():
142
69
69
143
70
    return 0
70
    return 0
144
71
71
145
72
146
72
if __name__ == "__main__":
73
if __name__ == "__main__":
147
73
    sys.exit(main())
74
    sys.exit(main())
148
diff --git a/bin/optical_resource.py b/bin/optical_resource.py
149
index 2e52780..92f9daf 100755
150
--- a/bin/optical_resource.py
151
+++ b/bin/optical_resource.py
152
@@ -76,5 +76,6 @@ def main():
153
76
            if cap in cdrom_id:
76
            if cap in cdrom_id:
154
77
                print(CAP_MAP[cap] + ": supported")
77
                print(CAP_MAP[cap] + ": supported")
155
78
78
156
79
157
79
if __name__ == "__main__":
80
if __name__ == "__main__":
158
80
    sys.exit(main())
81
    sys.exit(main())
159
diff --git a/bin/udev_resource.py b/bin/udev_resource.py
160
index 23ec94a..b18e085 100755
161
--- a/bin/udev_resource.py
162
+++ b/bin/udev_resource.py
163
@@ -62,7 +62,8 @@ class UdevResultLister:
164
62
        for c, devices in self._data.items():
62
        for c, devices in self._data.items():
165
63
            if short:
63
            if short:
166
64
                for d in devices:
64
                for d in devices:
168
65
                    print("{}".format(d.replace('None ', '').replace(' None', '')))
65
                    print("{}".format(
169
66
                        d.replace('None ', '').replace(' None', '')))
170
66
            else:
67
            else:
171
67
                print("{} ({}):".format(c, len(devices)))
68
                print("{} ({}):".format(c, len(devices)))
172
68
                for d in devices:
69
                for d in devices:
173
@@ -107,13 +108,13 @@ def main():
174
107
                        metavar=("CATEGORY"), default=(),
108
                        metavar=("CATEGORY"), default=(),
175
108
                        help="""List devices found under the requested
109
                        help="""List devices found under the requested
176
109
                        categories.
110
                        categories.
178
110
                        Acceptable categories to list are: 
111
                        Acceptable categories to list are:
179
111
                        {}""".format(', '.join(categories)))
112
                        {}""".format(', '.join(categories)))
180
112
    parser.add_argument('-f', '--filter', nargs='+', choices=categories,
113
    parser.add_argument('-f', '--filter', nargs='+', choices=categories,
181
113
                        metavar=("CATEGORY"), default=(),
114
                        metavar=("CATEGORY"), default=(),
182
114
                        help="""Filter devices found under the requested
115
                        help="""Filter devices found under the requested
183
115
                        categories.
116
                        categories.
185
116
                        Acceptable categories to list are: 
117
                        Acceptable categories to list are:
186
117
                        {}""".format(', '.join(categories)))
118
                        {}""".format(', '.join(categories)))
187
118
    parser.add_argument('-s', '--short', action='store_true')
119
    parser.add_argument('-s', '--short', action='store_true')
188
119
    args = parser.parse_args()
120
    args = parser.parse_args()
189
diff --git a/jobs/resource.pxu b/jobs/resource.pxu
190
index bcf4d70..7766b92 100644
191
--- a/jobs/resource.pxu
192
+++ b/jobs/resource.pxu
193
@@ -112,6 +112,7 @@ id: package
194
112
estimated_duration: 1.16
112
estimated_duration: 1.16
195
113
plugin: resource
113
plugin: resource
196
114
command:
114
command:
197
115
    # shellcheck disable=SC2016
198
115
    dpkg-query -W -f='name: ${Package}\nversion: ${Version}\nmodalias: ${Modaliases}\n\n' || \
116
    dpkg-query -W -f='name: ${Package}\nversion: ${Version}\nmodalias: ${Modaliases}\n\n' || \
199
116
    echo -e 'name: plainbox\nversion: 0.1\nmodalias:  \n\n' |\
117
    echo -e 'name: plainbox\nversion: 0.1\nmodalias:  \n\n' |\
200
117
    awk 'BEGIN {RS = ""; FS = "\n"}{print $1; print $2; if ($3 ~ /^modalias: .+$/) {print $3}; print "" }'
118
    awk 'BEGIN {RS = ""; FS = "\n"}{print $1; print $2; if ($3 ~ /^modalias: .+$/) {print $3}; print "" }'
201
@@ -124,7 +125,7 @@ plugin: resource
202
124
_summary: Enumerate available system executables
125
_summary: Enumerate available system executables
203
125
_description: Generates a resource for all available executables
126
_description: Generates a resource for all available executables
204
126
command:
127
command:
206
127
    find -H $(echo "$PATH" | sed -e 's/:/ /g') -maxdepth 1 -xtype f -executable -printf "name: %f\nlocation: %h\n\n"
128
    xargs -n1 -d: <<< "$PATH" | xargs -I{} find -H {} -maxdepth 1 -xtype f -executable -printf "name: %f\nlocation: %h\n\n"
207
128
    true
129
    true
208
129
130
209
130
id: device
131
id: device
210
@@ -191,7 +192,8 @@ _summary: Collect information about the running kernel
211
191
id: sleep
192
id: sleep
212
192
estimated_duration: 0.03
193
estimated_duration: 0.03
213
193
plugin: resource
194
plugin: resource
215
194
command: for state in `cat /sys/power/state`; do echo "$state: supported"; done
195
command:
216
196
  tr ' ' '\n' < /sys/power/state | while IFS= read -r state; do echo "$state: supported"; done
217
195
_summary: Create resource info for supported sleep states
197
_summary: Create resource info for supported sleep states
218
196
198
219
197
unit: template
199
unit: template
220
@@ -246,8 +248,8 @@ plugin: resource
221
246
_summary: Create resource info for environment variables
248
_summary: Create resource info for environment variables
222
247
command:
249
command:
223
248
 IFS=$'\n'
250
 IFS=$'\n'
226
249
 for e in `env | sed 's/=/:/g'`; do
251
 for e in $(env | sed 's/=/:/g'); do
227
250
     echo $e | awk -F':' '{print $1 ": " $2}'
252
     echo "$e" | awk -F':' '{print $1 ": " $2}'
228
251
 done
253
 done
229
252
254
230
253
id: mobilebroadband
255
id: mobilebroadband
231
@@ -282,9 +284,11 @@ _summary: Resource job to identify Wi-Fi STA supported protocols
232
282
_description:
284
_description:
233
283
 Job listing STA supported 802.11 protocols per interfaces.
285
 Job listing STA supported 802.11 protocols per interfaces.
234
284
command:
286
command:
236
285
 for i in `iw dev | grep -oP 'Interface\s+\K\w+'`; do iw phy phy$(iw dev $i info | grep -oP 'wiphy\s+\K\d+') info | grep -q 'VHT' && echo $i"_ac: supported" || echo $i"_ac: unsupported"; done
287
 # shellcheck disable=SC2046
237
288
 for i in $(iw dev | grep -oP 'Interface\s+\K\w+'); do iw phy phy$(iw dev "$i" info | grep -oP 'wiphy\s+\K\d+') info | grep -q 'VHT' && echo "$i""_ac: supported" || echo "$i""_ac: unsupported"; done
238
286
 # MCS 10 and 11 if present support the ax only 1024-QAM 
289
 # MCS 10 and 11 if present support the ax only 1024-QAM 
240
287
 for i in `iw dev | grep -oP 'Interface\s+\K\w+'`; do iw phy phy$(iw dev $i info | grep -oP 'wiphy\s+\K\d+') info | grep -q 'MCS 0-11' && echo $i"_ax: supported" || echo $i"_ax: unsupported"; done
290
 # shellcheck disable=SC2046
241
291
 for i in $(iw dev | grep -oP 'Interface\s+\K\w+'); do iw phy phy$(iw dev "$i" info | grep -oP 'wiphy\s+\K\d+') info | grep -q 'MCS 0-11' && echo "$i""_ax: supported" || echo "$i""_ax: unsupported"; done
242
288
estimated_duration: 0.5
292
estimated_duration: 0.5
243
289
flags: preserve-locale
293
flags: preserve-locale
244
290
294
245
@@ -304,8 +308,8 @@ id: requirements
246
304
estimated_duration: 0.01
308
estimated_duration: 0.01
247
305
plugin: resource
309
plugin: resource
248
306
command:
310
command:
251
307
 if [ -f $PLAINBOX_SESSION_SHARE/requirements_docs.txt ];then
311
 if [ -f "$PLAINBOX_SESSION_SHARE"/requirements_docs.txt ];then
252
308
    cat $PLAINBOX_SESSION_SHARE/requirements_docs.txt
312
    cat "$PLAINBOX_SESSION_SHARE"/requirements_docs.txt
253
309
 else
313
 else
254
310
    true
314
    true
255
311
 fi
315
 fi
256
@@ -347,7 +351,7 @@ plugin: resource
257
347
requires: executable.name == "fwts"
351
requires: executable.name == "fwts"
258
348
_summary: Generate an entry for each FWTS test available
352
_summary: Generate an entry for each FWTS test available
259
349
command:
353
command:
261
350
 for test in `checkbox-support-fwts_test --list`; do echo "name: $test"; echo ""; done
354
 for test in $(checkbox-support-fwts_test --list); do echo "name: $test"; echo ""; done
262
351
355
263
352
id: mir
356
id: mir
264
353
estimated_duration: 0.5
357
estimated_duration: 0.5
265
@@ -355,17 +359,18 @@ plugin: resource
266
355
requires: package.name == "mir-test-tools"
359
requires: package.name == "mir-test-tools"
267
356
_summary: Generate an entry for each MIR integration tests
360
_summary: Generate an entry for each MIR integration tests
268
357
command:
361
command:
271
358
 for test in `mir_integration_tests --gtest_list_tests | sed -n '/\.$/s/\.$//p'`; do echo "category: integration"; echo "name: $test"; echo ""; done
362
 for test in $(mir_integration_tests --gtest_list_tests | sed -n '/\.$/s/\.$//p'); do echo "category: integration"; echo "name: $test"; echo ""; done
272
359
 for test in `mir_acceptance_tests --gtest_list_tests | sed -n '/\.$/s/\.$//p'`; do echo "category: acceptance"; echo "name: $test"; echo ""; done
363
 for test in $(mir_acceptance_tests --gtest_list_tests | sed -n '/\.$/s/\.$//p'); do echo "category: acceptance"; echo "name: $test"; echo ""; done
273
360
364
274
361
id: wifi_interface_mode
365
id: wifi_interface_mode
275
362
estimated_duration: 0.1
366
estimated_duration: 0.1
276
363
plugin: resource
367
plugin: resource
277
364
command:
368
command:
280
365
 for i in `iw dev | grep -oP 'Interface\s+\K\w+'`;
369
 # shellcheck disable=SC2046
281
366
 do iw phy phy$(iw dev $i info | grep -oP 'wiphy\s+\K\d+') info |
370
 for i in $(iw dev | grep -oP 'Interface\s+\K\w+');
282
371
 do iw phy phy$(iw dev "$i" info | grep -oP 'wiphy\s+\K\d+') info |
283
367
 grep -Pzo '(?s)Supported interface modes:\n\K(\s+\*\s.*?\n)+' |
372
 grep -Pzo '(?s)Supported interface modes:\n\K(\s+\*\s.*?\n)+' |
285
368
 sed "s/.*\* \(.*\)/"$i"_\1: supported/" | tr -d '\000';
373
 sed "s/.*\* \(.*\)/""$i""_\1: supported/" | tr -d '\000';
286
369
 done
374
 done
287
370
_summary: Create resource info for supported wifi interface modes
375
_summary: Create resource info for supported wifi interface modes
288
371
376
289
diff --git a/requirements/container-tests-provider-resource-generic b/requirements/container-tests-provider-resource-generic
290
index 8bdb200..678a35c 100755
291
--- a/requirements/container-tests-provider-resource-generic
292
+++ b/requirements/container-tests-provider-resource-generic
293
@@ -14,4 +14,4 @@ echo "I: running 'develop' on checkbox-support"
294
14
( cd $TMPDIR/checkbox-support/ && python3 setup.py develop --quiet | sed -e 's/^/I (develop output) /' )
14
( cd $TMPDIR/checkbox-support/ && python3 setup.py develop --quiet | sed -e 's/^/I (develop output) /' )
295
15
15
296
16
./manage.py validate
16
./manage.py validate
298
17
./manage.py test -u
17
./manage.py test
299
diff --git a/requirements/deb-base.txt b/requirements/deb-base.txt
300
index 4d44ad8..ee93fed 100644
301
--- a/requirements/deb-base.txt
302
+++ b/requirements/deb-base.txt
303
@@ -4,3 +4,4 @@ libnl-genl-3-200
304
4
libnl-genl-3-dev
4
libnl-genl-3-dev
305
5
pkg-config
5
pkg-config
306
6
shellcheck
6
shellcheck
307
7
flake8
Status:	Merged
Approved by:	Sylvain Pineau on 2020-07-16
Approved revision:	e5959f6a045d0e3784575424b07c432eb300aed1
Merged at revision:	9e5f8cff2b244b4e11eb96fbd9f56ee50e9c93cd
Proposed branch:	~sylvain-pineau/plainbox-provider-resource:fix_flake8_shellcheck_errors
Merge into:	plainbox-provider-resource:master
Diff against target:	307 lines (+47/-36) 12 files modified bin/block_device_resource.py (+3/-2) bin/cpuinfo_resource.py (+3/-1) bin/efi_resource.py (+2/-1) bin/graphics_card_resource.py (+5/-2) bin/lsb_resource.py (+1/-3) bin/mobilebroadband_resource.sh (+6/-9) bin/module_resource.py (+1/-0) bin/optical_resource.py (+1/-0) bin/udev_resource.py (+4/-3) jobs/resource.pxu (+19/-14) requirements/container-tests-provider-resource-generic (+1/-1) requirements/deb-base.txt (+1/-0)
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Devices Certification Bot	2020-07-16	Needs Fixing on 2020-07-16
Sylvain Pineau (community)		Approve on 2020-07-16
Review via email: mp+387517@code.launchpad.net
1	diff --git a/bin/block_device_resource.py b/bin/block_device_resource.py
2	index 2ce9d29..ad6c5fb 100755
3	--- a/bin/block_device_resource.py
4	+++ b/bin/block_device_resource.py
5	@@ -33,7 +33,7 @@ def usb_support(name, version):
6	33	path = rootdir_pattern.sub('', os.readlink('/sys/block/%s' % name))	33	path = rootdir_pattern.sub('', os.readlink('/sys/block/%s' % name))
7	34		34
8	35	# Remove the usb config.interface part of the path	35	# Remove the usb config.interface part of the path
10	36	m = re.match('((.usb\d+).\/)\d-[\d\.:\-]+\/.*', path)	36	m = re.match('((.usb\d+).\/)\d-[\d\.:\-]+\/.*', path) # noqa: W605
11	37	if m:	37	if m:
12	38	device_path = m.group(1)	38	device_path = m.group(1)
13	39	hub_port_path = m.group(2)	39	hub_port_path = m.group(2)
14	@@ -137,8 +137,9 @@ def smart_support(name):
15	137	break	137	break
16	138	return supported	138	return supported
17	139		139
18			140
19	140	for path in glob('/sys/block//device') + glob('/sys/block//dm'):	141	for path in glob('/sys/block//device') + glob('/sys/block//dm'):
21	141	name = re.sub('./(.?)/(device\|dm)', '\g<1>', path)	142	name = re.sub('./(.?)/(device\|dm)', '\g<1>', path) # noqa: W605
22	142	state = device_state(name)	143	state = device_state(name)
23	143	usb2 = usb_support(name, 2.00)	144	usb2 = usb_support(name, 2.00)
24	144	usb3 = usb_support(name, 3.00)	145	usb3 = usb_support(name, 3.00)
25	diff --git a/bin/cpuinfo_resource.py b/bin/cpuinfo_resource.py
26	index d00eeab..31e8b63 100755
27	--- a/bin/cpuinfo_resource.py
28	+++ b/bin/cpuinfo_resource.py
29	@@ -29,7 +29,9 @@ CPUINFO_FILENAME = "/proc/cpuinfo"
30	29	FREQUENCY_FILENAME = "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq"	29	FREQUENCY_FILENAME = "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq"
31	30		30
32	31	# Filename where available frequency governors are stored.	31	# Filename where available frequency governors are stored.
34	32	GOVERNORS_FILENAME = "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors"	32	GOVERNORS_FILENAME = (
35			33	"/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors")
36			34
37	33		35
38	34	class CpuinfoResult:	36	class CpuinfoResult:
39	35		37
40	diff --git a/bin/efi_resource.py b/bin/efi_resource.py
41	index 2f53720..fa1e270 100755
42	--- a/bin/efi_resource.py
43	+++ b/bin/efi_resource.py
44	@@ -24,7 +24,8 @@ from checkbox_support.parsers.efi import EfiParser
45	24		24
46	25		25
47	26	# Command to retrieve efi information.	26	# Command to retrieve efi information.
49	27	COMMAND = "[ -d /sys/firmware/efi ] && cat /var/log/kern.log* \| grep -m 1 -o --color=never 'EFI v.*' \|\| true"	27	COMMAND = ("[ -d /sys/firmware/efi ] && cat /var/log/kern.log* \| "
50			28	"grep -m 1 -o --color=never 'EFI v.*' \|\| true")
51	28		29
52	29		30
53	30	class EfiResult:	31	class EfiResult:
54	diff --git a/bin/graphics_card_resource.py b/bin/graphics_card_resource.py
55	index 110c5f4..edd3b3b 100755
56	--- a/bin/graphics_card_resource.py
57	+++ b/bin/graphics_card_resource.py
58	@@ -31,6 +31,7 @@ def slugify(_string):
59	31	"-_.{}{}".format(string.ascii_letters, string.digits))	31	"-_.{}{}".format(string.ascii_letters, string.digits))
60	32	return ''.join(c if c in valid_chars else '_' for c in _string)	32	return ''.join(c if c in valid_chars else '_' for c in _string)
61	33		33
62			34
63	34	def subprocess_lines_generator(command):	35	def subprocess_lines_generator(command):
64	35	"""	36	"""
65	36	Generator that opens a subprocess and spits out lines	37	Generator that opens a subprocess and spits out lines
66	@@ -118,8 +119,9 @@ def main():
67	118		119
68	119	# udev_devices generates one dict per device, the list shown	120	# udev_devices generates one dict per device, the list shown
69	120	# below filters that to only VIDEO ones	121	# below filters that to only VIDEO ones
72	121	video_devices = list(r for r in udev_devices(udev_output)	122	video_devices = list(
73	122	if r.get("category", "") == 'VIDEO')	123	r for r in udev_devices(udev_output) if r.get(
74			124	"category", "") == 'VIDEO')
75	123	video_devices.sort(key=lambda r: bus_ordering(r))	125	video_devices.sort(key=lambda r: bus_ordering(r))
76	124		126
77	125	# commands needed to switch to and from particular GPU,	127	# commands needed to switch to and from particular GPU,
78	@@ -188,5 +190,6 @@ def main():
79	188	raise SystemExit(err)	190	raise SystemExit(err)
80	189	return 0	191	return 0
81	190		192
82			193
83	191	if __name__ == "__main__":	194	if __name__ == "__main__":
84	192	raise SystemExit(main())	195	raise SystemExit(main())
85	diff --git a/bin/lsb_resource.py b/bin/lsb_resource.py
86	index d33db78..297661e 100755
87	--- a/bin/lsb_resource.py
88	+++ b/bin/lsb_resource.py
89	@@ -20,8 +20,6 @@
90	20	import re	20	import re
91	21	import sys	21	import sys
92	22		22
93	23	from subprocess import Popen, PIPE
94	24
95	25		23
96	26	def get_lsb_release():	24	def get_lsb_release():
97	27	lsb_release_map = {	25	lsb_release_map = {
98	@@ -41,7 +39,7 @@ def get_lsb_release():
99	41	key = lsb_release_map[key]	39	key = lsb_release_map[key]
100	42	# Strip out quotes and newlines	40	# Strip out quotes and newlines
101	43	lsb_release[key] = re.sub('["\n]', '', value)	41	lsb_release[key] = re.sub('["\n]', '', value)
103	44	except:	42	except OSError:
104	45	# Missing file or permissions? Return the default lsb_release	43	# Missing file or permissions? Return the default lsb_release
105	46	pass	44	pass
106	47		45
107	diff --git a/bin/mobilebroadband_resource.sh b/bin/mobilebroadband_resource.sh
108	index 10e9adc..2220c5a 100755
109	--- a/bin/mobilebroadband_resource.sh
110	+++ b/bin/mobilebroadband_resource.sh
111	@@ -18,19 +18,16 @@
112	18	# along with Checkbox. If not, see <http://www.gnu.org/licenses/>.	18	# along with Checkbox. If not, see <http://www.gnu.org/licenses/>.
113	19	#	19	#
114	20		20
116	21	MMCLI_PATH=$(which mmcli)	21	MMCLI_PATH=$(command -v mmcli)
117	22		22
118	23	if [ -x "$MMCLI_PATH" ]; then	23	if [ -x "$MMCLI_PATH" ]; then
119	24	# Use mmcli to query for modem capabilities	24	# Use mmcli to query for modem capabilities
120	25	for i in $(mmcli --simple-status -L 2>/dev/null \|\| mmcli -L \| \	25	for i in $(mmcli --simple-status -L 2>/dev/null \|\| mmcli -L \| \
121	26	awk '/freedesktop\/ModemManager1\/Modem/ {print $1;}'); do	26	awk '/freedesktop\/ModemManager1\/Modem/ {print $1;}'); do
124	27	mmcli -m $i \|grep -q "supported: .gsm-umts." && GSM=yes	27	mmcli -m "$i" \| grep -q "supported: .gsm-umts." && GSM=yes
125	28	mmcli -m $i \|grep -q "supported: .cdma." && CDMA=yes	28	mmcli -m "$i" \| grep -q "supported: .cdma." && CDMA=yes
126	29	done	29	done
132	30	# force final exit status to true in case the test fails,	30	[ "$GSM" = "yes" ] && echo "gsm: supported"
133	31	# as it's a resource and we don't want it to fail unless it	31	[ "$CDMA" = "yes" ] && echo "cdma: supported"
129	32	# really failed :D
130	33	[ "$GSM" = "yes" ] && echo "gsm: supported" \|\| true
131	34	[ "$CDMA" = "yes" ] && echo "cdma: supported" \|\| true
134	35	fi	32	fi
136	36		33	exit 0
137	diff --git a/bin/module_resource.py b/bin/module_resource.py
138	index 8f3f53d..43d15a0 100755
139	--- a/bin/module_resource.py
140	+++ b/bin/module_resource.py
141	@@ -69,5 +69,6 @@ def main():
142	69		69
143	70	return 0	70	return 0
144	71		71
145			72
146	72	if __name__ == "__main__":	73	if __name__ == "__main__":
147	73	sys.exit(main())	74	sys.exit(main())
148	diff --git a/bin/optical_resource.py b/bin/optical_resource.py
149	index 2e52780..92f9daf 100755
150	--- a/bin/optical_resource.py
151	+++ b/bin/optical_resource.py
152	@@ -76,5 +76,6 @@ def main():
153	76	if cap in cdrom_id:	76	if cap in cdrom_id:
154	77	print(CAP_MAP[cap] + ": supported")	77	print(CAP_MAP[cap] + ": supported")
155	78		78
156			79
157	79	if __name__ == "__main__":	80	if __name__ == "__main__":
158	80	sys.exit(main())	81	sys.exit(main())
159	diff --git a/bin/udev_resource.py b/bin/udev_resource.py
160	index 23ec94a..b18e085 100755
161	--- a/bin/udev_resource.py
162	+++ b/bin/udev_resource.py
163	@@ -62,7 +62,8 @@ class UdevResultLister:
164	62	for c, devices in self._data.items():	62	for c, devices in self._data.items():
165	63	if short:	63	if short:
166	64	for d in devices:	64	for d in devices:
168	65	print("{}".format(d.replace('None ', '').replace(' None', '')))	65	print("{}".format(
169			66	d.replace('None ', '').replace(' None', '')))
170	66	else:	67	else:
171	67	print("{} ({}):".format(c, len(devices)))	68	print("{} ({}):".format(c, len(devices)))
172	68	for d in devices:	69	for d in devices:
173	@@ -107,13 +108,13 @@ def main():
174	107	metavar=("CATEGORY"), default=(),	108	metavar=("CATEGORY"), default=(),
175	108	help="""List devices found under the requested	109	help="""List devices found under the requested
176	109	categories.	110	categories.
178	110	Acceptable categories to list are:	111	Acceptable categories to list are:
179	111	{}""".format(', '.join(categories)))	112	{}""".format(', '.join(categories)))
180	112	parser.add_argument('-f', '--filter', nargs='+', choices=categories,	113	parser.add_argument('-f', '--filter', nargs='+', choices=categories,
181	113	metavar=("CATEGORY"), default=(),	114	metavar=("CATEGORY"), default=(),
182	114	help="""Filter devices found under the requested	115	help="""Filter devices found under the requested
183	115	categories.	116	categories.
185	116	Acceptable categories to list are:	117	Acceptable categories to list are:
186	117	{}""".format(', '.join(categories)))	118	{}""".format(', '.join(categories)))
187	118	parser.add_argument('-s', '--short', action='store_true')	119	parser.add_argument('-s', '--short', action='store_true')
188	119	args = parser.parse_args()	120	args = parser.parse_args()
189	diff --git a/jobs/resource.pxu b/jobs/resource.pxu
190	index bcf4d70..7766b92 100644
191	--- a/jobs/resource.pxu
192	+++ b/jobs/resource.pxu
193	@@ -112,6 +112,7 @@ id: package
194	112	estimated_duration: 1.16	112	estimated_duration: 1.16
195	113	plugin: resource	113	plugin: resource
196	114	command:	114	command:
197			115	# shellcheck disable=SC2016
198	115	dpkg-query -W -f='name: ${Package}\nversion: ${Version}\nmodalias: ${Modaliases}\n\n' \|\| \	116	dpkg-query -W -f='name: ${Package}\nversion: ${Version}\nmodalias: ${Modaliases}\n\n' \|\| \
199	116	echo -e 'name: plainbox\nversion: 0.1\nmodalias: \n\n' \|\	117	echo -e 'name: plainbox\nversion: 0.1\nmodalias: \n\n' \|\
200	117	awk 'BEGIN {RS = ""; FS = "\n"}{print $1; print $2; if ($3 ~ /^modalias: .+$/) {print $3}; print "" }'	118	awk 'BEGIN {RS = ""; FS = "\n"}{print $1; print $2; if ($3 ~ /^modalias: .+$/) {print $3}; print "" }'
201	@@ -124,7 +125,7 @@ plugin: resource
202	124	_summary: Enumerate available system executables	125	_summary: Enumerate available system executables
203	125	_description: Generates a resource for all available executables	126	_description: Generates a resource for all available executables
204	126	command:	127	command:
206	127	find -H $(echo "$PATH" \| sed -e 's/:/ /g') -maxdepth 1 -xtype f -executable -printf "name: %f\nlocation: %h\n\n"	128	xargs -n1 -d: <<< "$PATH" \| xargs -I{} find -H {} -maxdepth 1 -xtype f -executable -printf "name: %f\nlocation: %h\n\n"
207	128	true	129	true
208	129		130
209	130	id: device	131	id: device
210	@@ -191,7 +192,8 @@ _summary: Collect information about the running kernel
211	191	id: sleep	192	id: sleep
212	192	estimated_duration: 0.03	193	estimated_duration: 0.03
213	193	plugin: resource	194	plugin: resource
215	194	command: for state in `cat /sys/power/state`; do echo "$state: supported"; done	195	command:
216			196	tr ' ' '\n' < /sys/power/state \| while IFS= read -r state; do echo "$state: supported"; done
217	195	_summary: Create resource info for supported sleep states	197	_summary: Create resource info for supported sleep states
218	196		198
219	197	unit: template	199	unit: template
220	@@ -246,8 +248,8 @@ plugin: resource
221	246	_summary: Create resource info for environment variables	248	_summary: Create resource info for environment variables
222	247	command:	249	command:
223	248	IFS=$'\n'	250	IFS=$'\n'
226	249	for e in `env \| sed 's/=/:/g'`; do	251	for e in $(env \| sed 's/=/:/g'); do
227	250	echo $e \| awk -F':' '{print $1 ": " $2}'	252	echo "$e" \| awk -F':' '{print $1 ": " $2}'
228	251	done	253	done
229	252		254
230	253	id: mobilebroadband	255	id: mobilebroadband
231	@@ -282,9 +284,11 @@ _summary: Resource job to identify Wi-Fi STA supported protocols
232	282	_description:	284	_description:
233	283	Job listing STA supported 802.11 protocols per interfaces.	285	Job listing STA supported 802.11 protocols per interfaces.
234	284	command:	286	command:
236	285	for i in `iw dev \| grep -oP 'Interface\s+\K\w+'`; do iw phy phy$(iw dev $i info \| grep -oP 'wiphy\s+\K\d+') info \| grep -q 'VHT' && echo $i"_ac: supported" \|\| echo $i"_ac: unsupported"; done	287	# shellcheck disable=SC2046
237			288	for i in $(iw dev \| grep -oP 'Interface\s+\K\w+'); do iw phy phy$(iw dev "$i" info \| grep -oP 'wiphy\s+\K\d+') info \| grep -q 'VHT' && echo "$i""_ac: supported" \|\| echo "$i""_ac: unsupported"; done
238	286	# MCS 10 and 11 if present support the ax only 1024-QAM	289	# MCS 10 and 11 if present support the ax only 1024-QAM
240	287	for i in `iw dev \| grep -oP 'Interface\s+\K\w+'`; do iw phy phy$(iw dev $i info \| grep -oP 'wiphy\s+\K\d+') info \| grep -q 'MCS 0-11' && echo $i"_ax: supported" \|\| echo $i"_ax: unsupported"; done	290	# shellcheck disable=SC2046
241			291	for i in $(iw dev \| grep -oP 'Interface\s+\K\w+'); do iw phy phy$(iw dev "$i" info \| grep -oP 'wiphy\s+\K\d+') info \| grep -q 'MCS 0-11' && echo "$i""_ax: supported" \|\| echo "$i""_ax: unsupported"; done
242	288	estimated_duration: 0.5	292	estimated_duration: 0.5
243	289	flags: preserve-locale	293	flags: preserve-locale
244	290		294
245	@@ -304,8 +308,8 @@ id: requirements
246	304	estimated_duration: 0.01	308	estimated_duration: 0.01
247	305	plugin: resource	309	plugin: resource
248	306	command:	310	command:
251	307	if [ -f $PLAINBOX_SESSION_SHARE/requirements_docs.txt ];then	311	if [ -f "$PLAINBOX_SESSION_SHARE"/requirements_docs.txt ];then
252	308	cat $PLAINBOX_SESSION_SHARE/requirements_docs.txt	312	cat "$PLAINBOX_SESSION_SHARE"/requirements_docs.txt
253	309	else	313	else
254	310	true	314	true
255	311	fi	315	fi
256	@@ -347,7 +351,7 @@ plugin: resource
257	347	requires: executable.name == "fwts"	351	requires: executable.name == "fwts"
258	348	_summary: Generate an entry for each FWTS test available	352	_summary: Generate an entry for each FWTS test available
259	349	command:	353	command:
261	350	for test in `checkbox-support-fwts_test --list`; do echo "name: $test"; echo ""; done	354	for test in $(checkbox-support-fwts_test --list); do echo "name: $test"; echo ""; done
262	351		355
263	352	id: mir	356	id: mir
264	353	estimated_duration: 0.5	357	estimated_duration: 0.5
265	@@ -355,17 +359,18 @@ plugin: resource
266	355	requires: package.name == "mir-test-tools"	359	requires: package.name == "mir-test-tools"
267	356	_summary: Generate an entry for each MIR integration tests	360	_summary: Generate an entry for each MIR integration tests
268	357	command:	361	command:
271	358	for test in `mir_integration_tests --gtest_list_tests \| sed -n '/\.$/s/\.$//p'`; do echo "category: integration"; echo "name: $test"; echo ""; done	362	for test in $(mir_integration_tests --gtest_list_tests \| sed -n '/\.$/s/\.$//p'); do echo "category: integration"; echo "name: $test"; echo ""; done
272	359	for test in `mir_acceptance_tests --gtest_list_tests \| sed -n '/\.$/s/\.$//p'`; do echo "category: acceptance"; echo "name: $test"; echo ""; done	363	for test in $(mir_acceptance_tests --gtest_list_tests \| sed -n '/\.$/s/\.$//p'); do echo "category: acceptance"; echo "name: $test"; echo ""; done
273	360		364
274	361	id: wifi_interface_mode	365	id: wifi_interface_mode
275	362	estimated_duration: 0.1	366	estimated_duration: 0.1
276	363	plugin: resource	367	plugin: resource
277	364	command:	368	command:
280	365	for i in `iw dev \| grep -oP 'Interface\s+\K\w+'`;	369	# shellcheck disable=SC2046
281	366	do iw phy phy$(iw dev $i info \| grep -oP 'wiphy\s+\K\d+') info \|	370	for i in $(iw dev \| grep -oP 'Interface\s+\K\w+');
282			371	do iw phy phy$(iw dev "$i" info \| grep -oP 'wiphy\s+\K\d+') info \|
283	367	grep -Pzo '(?s)Supported interface modes:\n\K(\s+\\s.?\n)+' \|	372	grep -Pzo '(?s)Supported interface modes:\n\K(\s+\\s.?\n)+' \|
285	368	sed "s/.\ \(.*\)/"$i"_\1: supported/" \| tr -d '\000';	373	sed "s/.\ \(.*\)/""$i""_\1: supported/" \| tr -d '\000';
286	369	done	374	done
287	370	_summary: Create resource info for supported wifi interface modes	375	_summary: Create resource info for supported wifi interface modes
288	371		376
289	diff --git a/requirements/container-tests-provider-resource-generic b/requirements/container-tests-provider-resource-generic
290	index 8bdb200..678a35c 100755
291	--- a/requirements/container-tests-provider-resource-generic
292	+++ b/requirements/container-tests-provider-resource-generic
293	@@ -14,4 +14,4 @@ echo "I: running 'develop' on checkbox-support"
294	14	( cd $TMPDIR/checkbox-support/ && python3 setup.py develop --quiet \| sed -e 's/^/I (develop output) /' )	14	( cd $TMPDIR/checkbox-support/ && python3 setup.py develop --quiet \| sed -e 's/^/I (develop output) /' )
295	15		15
296	16	./manage.py validate	16	./manage.py validate
298	17	./manage.py test -u	17	./manage.py test
299	diff --git a/requirements/deb-base.txt b/requirements/deb-base.txt
300	index 4d44ad8..ee93fed 100644
301	--- a/requirements/deb-base.txt
302	+++ b/requirements/deb-base.txt
303	@@ -4,3 +4,4 @@ libnl-genl-3-200
304	4	libnl-genl-3-dev	4	libnl-genl-3-dev
305	5	pkg-config	5	pkg-config
306	6	shellcheck	6	shellcheck
307			7	flake8