Merge ~sylvain-pineau/plainbox-provider-resource:fix_flake8_shellcheck_errors into plainbox-provider-resource:master

[Sylvain Pineau]

sylvain@sylvain-ThinkPad-T480s:/tmp/plainbox-provider-resource$ ./manage.py test
test_job_command_jobs/resource.pxu:103-109_module (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:111-119_package (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:121-128_executable (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:130-135_device (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:137-142_removable_partition (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:144-153_staging/udev (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:155-166_dmi_present (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:168-175_dmi (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:177-182_efi (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:184-189_uname (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:191-196_sleep (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:198-205_optical_drive_{name} (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:207-212_block_device (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:214-219_display (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:221-235_usb (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:237-242_xinput (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:244-252_environment (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:254-258_mobilebroadband (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:260-272_virtualization (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:274-278_IEEE_80211 (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:280-291_wireless_sta_protocol (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:293-303_rtc (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:305-338_requirements (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:340-344_graphics_card (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:346-352_fwts (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:354-361_mir (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:363-373_wifi_interface_mode (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:375-382_snap (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:384-391_interface (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:393-400_connections (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:402-409_model_assertion (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:411-418_serial_assertion (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:420-432_serial_ports_static (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:434-443_ubuntu_core_features (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:445-457_net_if_management (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:459-469_net_if_management_attachment (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:471-480_bootloader (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:482-495_nvdimm_resource (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:67-72_cpuinfo (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:74-80_cdimage (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:82-87_dpkg (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:89-94_lsb (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_job_command_jobs/resource.pxu:96-101_meminfo (plainbox.provider_manager.InlineShellcheckTests) ... ok
test_shellcheck_/tmp/plainbox-provider-resource/bin/mobilebroadband_resource.sh (plainbox.provider_manager.ShellcheckTests) ... ok
test_flake8_/tmp/plainbox-provider-resource/bin/block_device_resource.py (plainbox.provider_manager.Flake8Tests) ... ok
test_flake8_/tmp/plainbox-provider-resource/bin/bootloader_resource.py (plainbox.provider_manager.Flake8Tests) ... ok
test_flake8_/tmp/plainbox-provider-resource/bin/cdimage_resource.py (plainbox.provider_manager.Flake8Tests) ... ok
test_flake8_/tmp/plainbox-provider-resource/bin/cpuinfo_resource.py (plainbox.provider_manager.Flake8Tests) ... ok
test_flake8_/tmp/plainbox-provider-resource/bin/display_resource.py (plainbox.provider_manager.Flake8Tests) ... ok
test_flake8_/tmp/plainbox-provider-resource/bin/dmi_resource.py (plainbox.provider_manager.Flake8Tests) ... ok
test_flake8_/tmp/plainbox-provider-resource/bin/dpkg_resource.py (plainbox.provider_manager.Flake8Tests) ... ok
test_flake8_/tmp/plainbox-provider-resource/bin/efi_resource.py (plainbox.provider_manager.Flake8Tests) ... ok
test_flake8_/tmp/plainbox-provider-resource/bin/graphics_card_resource.py (plainbox.provider_manager.Flake8Tests) ... ok
test_flake8_/tmp/plainbox-provider-resource/bin/lsb_resource.py (plainbox.provider_manager.Flake8Tests) ... ok
test_flake8_/tmp/plainbox-provider-resource/bin/meminfo_resource.py (plainbox.provider_manager.Flake8Tests) ... ok
test_flake8_/tmp/plainbox-provider-resource/bin/module_resource.py (plainbox.provider_manager.Flake8Tests) ... ok
test_flake8_/tmp/plainbox-provider-resource/bin/net_if_management.py (plainbox.provider_manager.Flake8Tests) ... ok
test_flake8_/tmp/plainbox-provider-resource/bin/optical_resource.py (plainbox.provider_manager.Flake8Tests) ... ok
test_flake8_/tmp/plainbox-provider-resource/bin/snapd_resource.py (plainbox.provider_manager.Flake8Tests) ... ok
test_flake8_/tmp/plainbox-provider-resource/bin/udev2resource.py (plainbox.provider_manager.Flake8Tests) ... ok
test_flake8_/tmp/plainbox-provider-resource/bin/udev_resource.py (plainbox.provider_manager.Flake8Tests) ... ok
test_flake8_/tmp/plainbox-provider-resource/bin/uname_resource.py (plainbox.provider_manager.Flake8Tests) ... ok
test_flake8_/tmp/plainbox-provider-resource/bin/xinput_resource.py (plainbox.provider_manager.Flake8Tests) ... ok
test (test_net_if_management.Test_CARA_T) ... ok
test (test_net_if_management.Test_CASCADE_500) ... ok
test (test_net_if_management.Test_RPI2_UC16_CCONF) ... ok
test (test_net_if_management.Test_RPI3B_UC16_CLOUDINIT) ... ok
test (test_net_if_management.Test_XENIAL_DESKTOP) ... ok

----------------------------------------------------------------------
Ran 68 tests in 4.519s

OK

[Sylvain Pineau (sylvain-pineau)]

re-starting from a fresh proposal

review: Approve

[Devices Certification Bot (ce-certification-qa)]

The merge was fine but running tests failed.

[bionic] [12:15:02] starting container
Device project added to bionic-testing
[xenial] [12:15:11] starting container
Device project added to xenial-testing
[bionic] [12:15:16] provisioning container
[focal] [12:15:20] starting container
[xenial] [12:15:21] provisioning container
Device project added to focal-testing
[focal] [12:15:35] provisioning container
[bionic] [12:15:49] Starting tests...
[bionic] Found a test script: ./requirements/container-tests-provider-resource-generic
[xenial] [12:15:51] Starting tests...
[xenial] Found a test script: ./requirements/container-tests-provider-resource-generic
[focal] [12:16:14] Starting tests...
[focal] Found a test script: ./requirements/container-tests-provider-resource-generic
[xenial] [12:17:00] container-tests-provider-resource-generic: PASS
[xenial] [12:17:00] Fixing file permissions in source directory
[xenial] [12:17:00] Destroying container
[bionic] [12:17:19] container-tests-provider-resource-generic: PASS
[bionic] [12:17:19] Fixing file permissions in source directory
[bionic] [12:17:19] Destroying container
[focal] [12:17:23] container-tests-provider-resource-generic: FAIL
[focal] output: https://paste.ubuntu.com/p/SPVGScYyzx/
[focal] [12:17:26] Fixing file permissions in source directory
[focal] [12:17:26] Destroying container

review: Needs Fixing

diff --git a/bin/block_device_resource.py b/bin/block_device_resource.py
index 2ce9d29..ad6c5fb 100755
--- a/bin/block_device_resource.py
+++ b/bin/block_device_resource.py
@@ -33,7 +33,7 @@ def usb_support(name, version):
     path = rootdir_pattern.sub('', os.readlink('/sys/block/%s' % name))
 
     # Remove the usb config.interface part of the path
-    m = re.match('((.*usb\d+).*\/)\d-[\d\.:\-]+\/.*', path)
+    m = re.match('((.*usb\d+).*\/)\d-[\d\.:\-]+\/.*', path)  # noqa: W605
     if m:
         device_path = m.group(1)
         hub_port_path = m.group(2)
@@ -137,8 +137,9 @@ def smart_support(name):
                     break
     return supported
 
+
 for path in glob('/sys/block/*/device') + glob('/sys/block/*/dm'):
-    name = re.sub('.*/(.*?)/(device|dm)', '\g<1>', path)
+    name = re.sub('.*/(.*?)/(device|dm)', '\g<1>', path)  # noqa: W605
     state = device_state(name)
     usb2 = usb_support(name, 2.00)
     usb3 = usb_support(name, 3.00)
diff --git a/bin/cpuinfo_resource.py b/bin/cpuinfo_resource.py
index d00eeab..31e8b63 100755
--- a/bin/cpuinfo_resource.py
+++ b/bin/cpuinfo_resource.py
@@ -29,7 +29,9 @@ CPUINFO_FILENAME = "/proc/cpuinfo"
 FREQUENCY_FILENAME = "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq"
 
 # Filename where available frequency governors are stored.
-GOVERNORS_FILENAME = "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors"
+GOVERNORS_FILENAME = (
+    "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors")
+
 
 class CpuinfoResult:
 
diff --git a/bin/efi_resource.py b/bin/efi_resource.py
index 2f53720..fa1e270 100755
--- a/bin/efi_resource.py
+++ b/bin/efi_resource.py
@@ -24,7 +24,8 @@ from checkbox_support.parsers.efi import EfiParser
 
 
 # Command to retrieve efi information.
-COMMAND = "[ -d /sys/firmware/efi ] && cat /var/log/kern.log* | grep -m 1 -o --color=never 'EFI v.*' || true"
+COMMAND = ("[ -d /sys/firmware/efi ] && cat /var/log/kern.log* | "
+           "grep -m 1 -o --color=never 'EFI v.*' || true")
 
 
 class EfiResult:
diff --git a/bin/graphics_card_resource.py b/bin/graphics_card_resource.py
index 110c5f4..edd3b3b 100755
--- a/bin/graphics_card_resource.py
+++ b/bin/graphics_card_resource.py
@@ -31,6 +31,7 @@ def slugify(_string):
         "-_.{}{}".format(string.ascii_letters, string.digits))
     return ''.join(c if c in valid_chars else '_' for c in _string)
 
+
 def subprocess_lines_generator(command):
     """
     Generator that opens a subprocess and spits out lines
@@ -118,8 +119,9 @@ def main():
 
     # udev_devices generates one dict per device, the list shown
     # below filters that to only VIDEO ones
-    video_devices = list(r for r in udev_devices(udev_output)
-                               if r.get("category", "") == 'VIDEO')
+    video_devices = list(
+        r for r in udev_devices(udev_output) if r.get(
+            "category", "") == 'VIDEO')
     video_devices.sort(key=lambda r: bus_ordering(r))
 
     # commands needed to switch to and from particular GPU,
@@ -188,5 +190,6 @@ def main():
         raise SystemExit(err)
     return 0
 
+
 if __name__ == "__main__":
     raise SystemExit(main())
diff --git a/bin/lsb_resource.py b/bin/lsb_resource.py
index d33db78..297661e 100755
--- a/bin/lsb_resource.py
+++ b/bin/lsb_resource.py
@@ -20,8 +20,6 @@
 import re
 import sys
 
-from subprocess import Popen, PIPE
-
 
 def get_lsb_release():
     lsb_release_map = {
@@ -41,7 +39,7 @@ def get_lsb_release():
                     key = lsb_release_map[key]
                     # Strip out quotes and newlines
                     lsb_release[key] = re.sub('["\n]', '', value)
-    except:
+    except OSError:
         # Missing file or permissions? Return the default lsb_release
         pass
 
diff --git a/bin/mobilebroadband_resource.sh b/bin/mobilebroadband_resource.sh
index 10e9adc..2220c5a 100755
--- a/bin/mobilebroadband_resource.sh
+++ b/bin/mobilebroadband_resource.sh
@@ -18,19 +18,16 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-MMCLI_PATH=$(which mmcli)
+MMCLI_PATH=$(command -v mmcli)
 
 if [ -x "$MMCLI_PATH" ]; then
     # Use mmcli to query for modem capabilities
     for i in $(mmcli --simple-status -L 2>/dev/null || mmcli -L | \
                awk '/freedesktop\/ModemManager1\/Modem/ {print $1;}'); do
-        mmcli -m $i |grep -q "supported: .*gsm-umts.*" && GSM=yes
-        mmcli -m $i |grep -q "supported: .*cdma.*" && CDMA=yes
+        mmcli -m "$i" | grep -q "supported: .*gsm-umts.*" && GSM=yes
+        mmcli -m "$i" | grep -q "supported: .*cdma.*" && CDMA=yes
     done
-    # force final exit status to true in case the test fails,
-    # as it's a resource and we don't want it to fail unless it
-    # really failed :D
-    [ "$GSM" = "yes" ] && echo "gsm: supported" || true
-    [ "$CDMA" = "yes" ] && echo "cdma: supported" || true
+    [ "$GSM" = "yes" ] && echo "gsm: supported"
+    [ "$CDMA" = "yes" ] && echo "cdma: supported"
 fi
-
+exit 0
diff --git a/bin/module_resource.py b/bin/module_resource.py
index 8f3f53d..43d15a0 100755
--- a/bin/module_resource.py
+++ b/bin/module_resource.py
@@ -69,5 +69,6 @@ def main():
 
     return 0
 
+
 if __name__ == "__main__":
     sys.exit(main())
diff --git a/bin/optical_resource.py b/bin/optical_resource.py
index 2e52780..92f9daf 100755
--- a/bin/optical_resource.py
+++ b/bin/optical_resource.py
@@ -76,5 +76,6 @@ def main():
             if cap in cdrom_id:
                 print(CAP_MAP[cap] + ": supported")
 
+
 if __name__ == "__main__":
     sys.exit(main())
diff --git a/bin/udev_resource.py b/bin/udev_resource.py
index 23ec94a..b18e085 100755
--- a/bin/udev_resource.py
+++ b/bin/udev_resource.py
@@ -62,7 +62,8 @@ class UdevResultLister:
         for c, devices in self._data.items():
             if short:
                 for d in devices:
-                    print("{}".format(d.replace('None ', '').replace(' None', '')))
+                    print("{}".format(
+                        d.replace('None ', '').replace(' None', '')))
             else:
                 print("{} ({}):".format(c, len(devices)))
                 for d in devices:
@@ -107,13 +108,13 @@ def main():
                         metavar=("CATEGORY"), default=(),
                         help="""List devices found under the requested
                         categories.
-                        Acceptable categories to list are: 
+                        Acceptable categories to list are:
                         {}""".format(', '.join(categories)))
     parser.add_argument('-f', '--filter', nargs='+', choices=categories,
                         metavar=("CATEGORY"), default=(),
                         help="""Filter devices found under the requested
                         categories.
-                        Acceptable categories to list are: 
+                        Acceptable categories to list are:
                         {}""".format(', '.join(categories)))
     parser.add_argument('-s', '--short', action='store_true')
     args = parser.parse_args()
diff --git a/jobs/resource.pxu b/jobs/resource.pxu
index bcf4d70..7766b92 100644
--- a/jobs/resource.pxu
+++ b/jobs/resource.pxu
@@ -112,6 +112,7 @@ id: package
 estimated_duration: 1.16
 plugin: resource
 command:
+    # shellcheck disable=SC2016
     dpkg-query -W -f='name: ${Package}\nversion: ${Version}\nmodalias: ${Modaliases}\n\n' || \
     echo -e 'name: plainbox\nversion: 0.1\nmodalias:  \n\n' |\
     awk 'BEGIN {RS = ""; FS = "\n"}{print $1; print $2; if ($3 ~ /^modalias: .+$/) {print $3}; print "" }'
@@ -124,7 +125,7 @@ plugin: resource
 _summary: Enumerate available system executables
 _description: Generates a resource for all available executables
 command:
-    find -H $(echo "$PATH" | sed -e 's/:/ /g') -maxdepth 1 -xtype f -executable -printf "name: %f\nlocation: %h\n\n"
+    xargs -n1 -d: <<< "$PATH" | xargs -I{} find -H {} -maxdepth 1 -xtype f -executable -printf "name: %f\nlocation: %h\n\n"
     true
 
 id: device
@@ -191,7 +192,8 @@ _summary: Collect information about the running kernel
 id: sleep
 estimated_duration: 0.03
 plugin: resource
-command: for state in `cat /sys/power/state`; do echo "$state: supported"; done
+command:
+  tr ' ' '\n' < /sys/power/state | while IFS= read -r state; do echo "$state: supported"; done
 _summary: Create resource info for supported sleep states
 
 unit: template
@@ -246,8 +248,8 @@ plugin: resource
 _summary: Create resource info for environment variables
 command:
  IFS=$'\n'
- for e in `env | sed 's/=/:/g'`; do
-     echo $e | awk -F':' '{print $1 ": " $2}'
+ for e in $(env | sed 's/=/:/g'); do
+     echo "$e" | awk -F':' '{print $1 ": " $2}'
  done
 
 id: mobilebroadband
@@ -282,9 +284,11 @@ _summary: Resource job to identify Wi-Fi STA supported protocols
 _description:
  Job listing STA supported 802.11 protocols per interfaces.
 command:
- 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
+ # shellcheck disable=SC2046
+ 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
  # MCS 10 and 11 if present support the ax only 1024-QAM 
- 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
+ # shellcheck disable=SC2046
+ 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
 estimated_duration: 0.5
 flags: preserve-locale
 
@@ -304,8 +308,8 @@ id: requirements
 estimated_duration: 0.01
 plugin: resource
 command:
- if [ -f $PLAINBOX_SESSION_SHARE/requirements_docs.txt ];then
-    cat $PLAINBOX_SESSION_SHARE/requirements_docs.txt
+ if [ -f "$PLAINBOX_SESSION_SHARE"/requirements_docs.txt ];then
+    cat "$PLAINBOX_SESSION_SHARE"/requirements_docs.txt
  else
     true
  fi
@@ -347,7 +351,7 @@ plugin: resource
 requires: executable.name == "fwts"
 _summary: Generate an entry for each FWTS test available
 command:
- for test in `checkbox-support-fwts_test --list`; do echo "name: $test"; echo ""; done
+ for test in $(checkbox-support-fwts_test --list); do echo "name: $test"; echo ""; done
 
 id: mir
 estimated_duration: 0.5
@@ -355,17 +359,18 @@ plugin: resource
 requires: package.name == "mir-test-tools"
 _summary: Generate an entry for each MIR integration tests
 command:
- for test in `mir_integration_tests --gtest_list_tests | sed -n '/\.$/s/\.$//p'`; do echo "category: integration"; echo "name: $test"; echo ""; done
- for test in `mir_acceptance_tests --gtest_list_tests | sed -n '/\.$/s/\.$//p'`; do echo "category: acceptance"; echo "name: $test"; echo ""; done
+ for test in $(mir_integration_tests --gtest_list_tests | sed -n '/\.$/s/\.$//p'); do echo "category: integration"; echo "name: $test"; echo ""; done
+ for test in $(mir_acceptance_tests --gtest_list_tests | sed -n '/\.$/s/\.$//p'); do echo "category: acceptance"; echo "name: $test"; echo ""; done
 
 id: wifi_interface_mode
 estimated_duration: 0.1
 plugin: resource
 command:
- 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 |
+ # shellcheck disable=SC2046
+ 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 -Pzo '(?s)Supported interface modes:\n\K(\s+\*\s.*?\n)+' |
- sed "s/.*\* \(.*\)/"$i"_\1: supported/" | tr -d '\000';
+ sed "s/.*\* \(.*\)/""$i""_\1: supported/" | tr -d '\000';
  done
 _summary: Create resource info for supported wifi interface modes
 
diff --git a/requirements/container-tests-provider-resource-generic b/requirements/container-tests-provider-resource-generic
index 8bdb200..678a35c 100755
--- a/requirements/container-tests-provider-resource-generic
+++ b/requirements/container-tests-provider-resource-generic
@@ -14,4 +14,4 @@ echo "I: running 'develop' on checkbox-support"
 ( cd $TMPDIR/checkbox-support/ && python3 setup.py develop --quiet | sed -e 's/^/I (develop output) /' )
 
 ./manage.py validate
-./manage.py test -u
+./manage.py test
diff --git a/requirements/deb-base.txt b/requirements/deb-base.txt
index 4d44ad8..ee93fed 100644
--- a/requirements/deb-base.txt
+++ b/requirements/deb-base.txt
@@ -4,3 +4,4 @@ libnl-genl-3-200
 libnl-genl-3-dev
 pkg-config
 shellcheck
+flake8