Improve test matrix

Simplify YAML structure and parsing by removing the superfluous list
layer.
Add additional matrix entries to cover more user ACL constellations.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>

tests/matrix.yaml

@@ -1,43 +1,106 @@
 ---
-- user:user:r:
+user:user:r:
+  user:
     user:
-      user:
-        read: true
-        write: false
-        execute: false
-    group:
-      null:
-        read: true
-        write: false
-        execute: false
-    mask:
-      null:
-        read: true
-        write: false
-        execute: false
-    other:
-      null:
-        read: true
-        write: false
-        execute: false
-- user:user:-w-:
+      read: true
+      write: false
+      execute: false
+  group:
+    null:
+      read: true
+      write: false
+      execute: false
+  mask:
+    null:
+      read: true
+      write: false
+      execute: false
+  other:
+    null:
+      read: true
+      write: false
+      execute: false
+user:user:-w-:
+  user:
     user:
-      user:
-        read: false
-        write: true
-        execute: false
-    group:
-      null:
-        read: true
-        write: false
-        execute: false
-    mask:
-      null:
-        read: true
-        write: true
-        execute: false
-    other:
-      null:
-        read: true
-        write: false
-        execute: false
+      read: false
+      write: true
+      execute: false
+  group:
+    null:
+      read: true
+      write: false
+      execute: false
+  mask:
+    null:
+      read: true
+      write: true
+      execute: false
+  other:
+    null:
+      read: true
+      write: false
+      execute: false
+user:user:--x:
+  user:
+    user:
+      read: false
+      write: false
+      execute: true
+  group:
+    null:
+      read: true
+      write: false
+      execute: false
+  mask:
+    null:
+      read: true
+      write: false
+      execute: true
+  other:
+    null:
+      read: true
+      write: false
+      execute: false
+user:user:r-x:
+  user:
+    user:
+      read: true
+      write: false
+      execute: true
+  group:
+    null:
+      read: true
+      write: false
+      execute: false
+  mask:
+    null:
+      read: true
+      write: false
+      execute: true
+  other:
+    null:
+      read: true
+      write: false
+      execute: false
+user:user:rwx:
+  user:
+    user:
+      read: true
+      write: true
+      execute: true
+  group:
+    null:
+      read: true
+      write: false
+      execute: false
+  mask:
+    null:
+      read: true
+      write: true
+      execute: true
+  other:
+    null:
+      read: true
+      write: false
+      execute: false

tests/test_pyacl.py

@@ -20,12 +20,7 @@ def load_yaml(file):
   with open(join(dirname(__file__), file)) as fh:
     data = safe_load(fh)
 
-  out = []
-
-  for entry in data:
-    out.append(tuple(entry.items())[0])
-
-  return out
+  return list(data.items())
 
 
 @mark.parametrize('aclin, aclout', load_yaml('matrix.yaml'))