summaryrefslogtreecommitdiffstats
path: root/features
diff options
context:
space:
mode:
authorCyril Brulebois <ckb@riseup.net>2019-01-05 21:39:08 +0100
committerCyril Brulebois <ckb@riseup.net>2019-01-05 22:06:02 +0100
commit56daa30257f5c27ca7ac5d62d377e22a3b8b9525 (patch)
tree8f74d9e0a376998edb330179c5027f76680b1bed /features
parent400afa7df67cd2d88db21323ea79d1957fd2b945 (diff)
Test suite: switch the FS label check to the new helpers (refs: #16003).
Diffstat (limited to 'features')
-rw-r--r--features/step_definitions/usb.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/features/step_definitions/usb.rb b/features/step_definitions/usb.rb
index 189c872..4849425 100644
--- a/features/step_definitions/usb.rb
+++ b/features/step_definitions/usb.rb
@@ -868,7 +868,11 @@ end
Then /^the label of the FAT filesystem on the system partition on "([^"]+)" is "([^"]+)"$/ do |name, label|
disk_dev = $vm.disk_dev(name)
part_dev = disk_dev + "1"
- fs_label = $vm.execute_successfully("udisksctl info --block-device #{part_dev} | awk '/IdLabel:/ {print $2}'").stdout.chomp
+
+ # Get FS label from the block area:
+ udisks_info = $vm.execute_successfully("udisksctl info --block-device #{part_dev}").stdout
+ fs_label = parse_udisksctl_info(udisks_info)['org.freedesktop.UDisks2.Block']['IdLabel']
+
assert(label == fs_label,
"FS label on #{part_dev} is #{fs_label} instead of the expected #{label}")
end