Improve goss tests to match previous serverspec ones

goss/goss_pimusicbox.yaml

@@ -7,8 +7,9 @@ file:
     # pimusicbox dependencies
   /sbin/wpa_cli:
     exists: true
-    # FIXME: it should be executable
     filetype: file
+    mode:
+      match-regexp: '[0-9][1357][1357][1357]'
   /etc/wpa_supplicant:
     exists: true
     filetype: directory

goss/goss_rclocal.yaml

@@ -5,5 +5,6 @@ file:
     owner: root
     group: root
     filetype: file
-    # should not contain 'By default this script does nothing.'
-    contents: ['/opt/musicbox/startup.sh']
+    contents:
+      - '/opt/musicbox/startup.sh'
+      - '!By default this script does nothing.'

goss/goss_system.yaml

@@ -4,8 +4,10 @@ file:
     owner: root
     group: root
     filetype: file
-    # readable by owner, group and others
-    contents: ['TZ=:/etc/localtime']
+    mode:
+      match-regexp: '[0-9][4567][4567][4567]'
+    contents:
+      - 'TZ=:/etc/localtime'
   /etc/init.d/resize2fs_once:
     exists: false
   /etc/fstab:
@@ -14,19 +16,17 @@ file:
     group: root
     filetype: file
     mode: 644
-    contents: [
-      'LABEL=boot      /boot',
-      'LABEL=rootfs    /'
-    ]
+    contents:
+      - 'LABEL=boot      /boot'
+      - 'LABEL=rootfs    /'
   /boot/cmdline.txt:
     exists: true
     owner: root
     group: root
     filetype: file
-    # should not contain 'init=/usr/lib/raspi-config/init_resize.sh'
-    contents: [
-      'root=/dev/mmcblk0p2'
-    ]
+    contents:
+        - 'root=/dev/mmcblk0p2'
+        - !'init=/usr/lib/raspi-config/init_resize.sh'
   /boot/userconf.txt:
     exists: true
     owner: root