Merge ~pwlars/plainbox-provider-checkbox:no-storage-device-test-crypto into plainbox-provider-checkbox:master

[Paul Larson]

Small optimization to skip adding partitions if we couldn't detect the filesystem (those won't be considered anyway). But the main purpose here was to skip partitions that have the fs type "crypto_LUKS" since we can't use them for this test. I found this when running http://10.102.156.15:8080/job/cert-thinkedge-se30-intel-kernel-20-beta/3/testReport/junit/com.canonical/certification__disk_storage_device_nvme0n1/com_canonical_certification__disk_storage_device_nvme0n1/

Log:
Testing disk nvme0n1
identified as a disk...
test will be run on partition /dev/nvme0n1p5
+ mount /dev/nvme0n1p5 /tmp/tmpje0opw2v
mount: /tmp/tmpje0opw2v: unknown filesystem type 'crypto_LUKS'.
Traceback (most recent call last):
  File "/tmp/nest-punomw35.31c87e8f098638c0afa1eb324ec91d6eadc1613fa55a5682526f26226262a817/storage_test.py", line 152, in <module>
    main()
  File "/tmp/nest-punomw35.31c87e8f098638c0afa1eb324ec91d6eadc1613fa55a5682526f26226262a817/storage_test.py", line 148, in main
    disk_test(udev_name)
  File "/tmp/nest-punomw35.31c87e8f098638c0afa1eb324ec91d6eadc1613fa55a5682526f26226262a817/storage_test.py", line 134, in disk_test
    mount(part_to_test, mount_dir)
  File "/tmp/nest-punomw35.31c87e8f098638c0afa1eb324ec91d6eadc1613fa55a5682526f26226262a817/storage_test.py", line 50, in mount
    sp.check_call(cmd, shell=True)
  File "/snap/checkbox/1929/checkbox-runtime/usr/lib/python3.8/subprocess.py", line 364, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command 'mount /dev/nvme0n1p5 /tmp/tmpje0opw2v' returned non-zero exit status 32.

[Sylvain Pineau (sylvain-pineau)]

Thanks for the fix, +1

review: Approve

diff --git a/bin/storage_test.py b/bin/storage_test.py
index 58453e2..d239b9d 100755
--- a/bin/storage_test.py
+++ b/bin/storage_test.py
@@ -32,11 +32,11 @@ def find_largest_partition(device):
     for entry in out.decode(sys.stdout.encoding).splitlines():
         params = entry.strip().split()
         if len(params) == 3:
-            # filesystem info missing, so it's unknown
-            params.append(None)
+            # filesystem info missing, so it's unknown - skip
+            continue
         blk_devs.append(BlkDev(*params))
     blk_devs[:] = [bd for bd in blk_devs if (
-        bd.type in ('part', 'md') and bd.fstype is not None)]
+        bd.type in ('part', 'md') and bd.fstype != "crypto_LUKS")]
     if not blk_devs:
         raise SystemExit(
             'ERROR: No suitable partitions found on device {}'.format(device))