pyacl/acl.py

@@ -52,7 +52,7 @@ def parse_permission(strpermission):
   permap_s = {
     'r': 'read',
     'w': 'write',
-    'x': 'execute',
+    'e': 'execute',
   }
 
   outmap = DEFAULT_PERMISSIONS.copy()

tests/matrix.yaml

@@ -1,5 +1,5 @@
 ---
-user:user:r:
+- user:user:r:
     user:
       user:
         read: true
@@ -20,7 +20,7 @@ user:user:r:
         read: true
         write: false
         execute: false
-user:user:-w-:
+- user:user:-w-:
     user:
       user:
         read: false
@@ -41,66 +41,3 @@ user:user:-w-:
         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,7 +20,12 @@ def load_yaml(file):
   with open(join(dirname(__file__), file)) as fh:
     data = safe_load(fh)
 
-  return list(data.items())
+  out = []
+
+  for entry in data:
+    out.append(tuple(entry.items())[0])
+
+  return out
 
 
 @mark.parametrize('aclin, aclout', load_yaml('matrix.yaml'))