Better tests for group_kick

unit/test_all.py

@@ -2601,22 +2601,21 @@ class TestModelverse(unittest.TestCase):
         group_create(group_name_1)
         self.do_as_user("admin", group_create, [group_name_2])
         self.do_as_user("admin", group_join, [group_name_2, "user"])
-        self.do_as_user("admin", group_create, [group_name_3])
 
         # Kick user from group
-        assert group_list() == set(["users", group_name_2])
-        self.do_as_user("admin", group_join, [group_name_2, "user"])
-        assert group_list() == set(["users"])
+        assert group_list() == set([(group_name_1, True), (group_name_2, False)])
+        self.do_as_user("admin", group_kick, [group_name_2, "user"])
+        assert group_list() == set([(group_name_1, True)])
 
         # Kick self (owner) from group
-        assert group_list() == set(["users"])
+        assert group_list() == set([(group_name_1, True)])
         group_create(group_name_3)
-        assert group_list() == set(["users", group_name_3])
+        assert group_list() == set([(group_name_1, True), (group_name_3, True)])
         assert group_kick(group_name_3, "user") == None
-        assert group_list() == set(["users"])
+        assert group_list() == set([(group_name_1, True)])
 
         # Empty groups are not deleted
-        self.do_as_user("admin", group_join(group_name_3, "user"))
+        self.do_as_user("admin", group_join, [group_name_3, "user"])
 
         # Kick user not in group
         try: