Browse Source

Patch up tests for permissions

Yentl Van Tendeloo 7 years ago
parent
commit
eaa5b4dc87
1 changed files with 7 additions and 5 deletions
  1. 7 5
      unit/test_all.py

+ 7 - 5
unit/test_all.py

@@ -2640,21 +2640,23 @@ class TestModelverse(unittest.TestCase):
         try:
             # Might already exist
             group_create("users")
-        except:
+        except GroupExists:
             pass
         permission_group("users/user/test/a", "users")
         permission_modify("users/user/test/a", "210")
 
         self.do_create_user("group_user")
         self.do_create_user("other_user")
-        group_join("users", "group_user")
+        try:
+            group_join("users", "group_user")
+        except UserExists:
+            pass
 
         # Test initial situation, where we have owners user:users with permission 210
         self.do_test_permission("users/user/test/a", {"admin": "RW", "user": "RW", "group_user": "R", "other_user": ""})
 
         # Change owner, but permissions stay the same
         permission_owner("users/user/test/a", "group_user")
-        print("Groups: " + str(group_list()))
         self.do_test_permission("users/user/test/a", {"admin": "RW", "user": "R", "group_user": "RW", "other_user": ""})
 
         # Can no longer modify permissions: only owner can do that
@@ -2699,13 +2701,13 @@ class TestModelverse(unittest.TestCase):
         try:
             # Might already exist
             group_create("users")
-        except:
+        except GroupExists:
             pass
         self.do_create_user("group_user")
         try:
             # Might already be a member
             group_join("users", "group_user")
-        except:
+        except UserExists:
             pass
 
         permission_group("users/user/test/a/b", "users")