Merge ~sylvain-pineau/plainbox-provider-checkbox:fix-1839903 into plainbox-provider-checkbox:master

[Sylvain Pineau]

Fix FDE test on core18, tested on both munich and tillamook

[Jonathan Cave (jocave)]

I would like to know what has changed that means the test that worked on UC16 and uses a command that works in a normal shell, does not seem to work in checkbox on UC18. This is useful info and could help inform other testing.

Would need to check whether the suggested alternative works on other FDE devices too (including UC16)

review: Needs Information

[Sylvain Pineau (sylvain-pineau)]

I'll need this fix to run the test on UC18 projects this week.

It was tested on UC18 (munich) and UC16 (tillamook).

Let's open a bug to track what has changed and start investigating.

[Sylvain Pineau (sylvain-pineau)]

I'm landing the fix, self-approving

review: Approve

diff --git a/bin/fde_tests.py b/bin/fde_tests.py
index 3008735..fd9ea14 100755
--- a/bin/fde_tests.py
+++ b/bin/fde_tests.py
@@ -28,7 +28,10 @@ def main():
     base_mount = '/' if on_desktop else '/writable'
 
     # discover the underlying mount point for the encrypted part
-    cmd = 'findmnt {} -n -o SOURCE'.format(base_mount)
+    if on_desktop:
+        cmd = 'findmnt {} -n -o SOURCE'.format(base_mount)
+    else:
+        cmd = 'findfs LABEL=writable'
     print('+ {}'.format(cmd))
     try:
         source = sp.check_output(cmd, shell=True).decode(