Browse Source

HUE-9096 [doc] Fix bug in get_or_create group

Romain 6 years ago
parent
commit
3005925ba2

+ 4 - 4
desktop/core/src/desktop/document2_tests.py

@@ -574,8 +574,10 @@ class TestDocument2(object):
 class TestDocument2Permissions(object):
 
   def setUp(self):
-    self.client = make_logged_in_client(username="perm_user", groupname="default", recreate=True, is_superuser=False)
-    self.client_not_me = make_logged_in_client(username="not_perm_user", groupname="default", recreate=True, is_superuser=False)
+    self.default_group = get_default_user_group()
+
+    self.client = make_logged_in_client(username="perm_user", groupname=self.default_group.name, recreate=True, is_superuser=False)
+    self.client_not_me = make_logged_in_client(username="not_perm_user", groupname=self.default_group.name, recreate=True, is_superuser=False)
 
     self.user = User.objects.get(username="perm_user")
     self.user_not_me = User.objects.get(username="not_perm_user")
@@ -583,8 +585,6 @@ class TestDocument2Permissions(object):
     grant_access(self.user.username, self.user.username, "desktop")
     grant_access(self.user_not_me.username, self.user_not_me.username, "desktop")
 
-    self.default_group = get_default_user_group()
-
     # This creates the user directories for the new user
     response = self.client.get('/desktop/api2/doc/')
     data = json.loads(response.content)

+ 5 - 1
desktop/core/src/desktop/lib/django_test_util.py

@@ -69,7 +69,11 @@ def make_logged_in_client(username="test", password="test", is_superuser=True, r
       user.save()
 
   if groupname is not None:
-    group, created = Group.objects.get_or_create(name=groupname)
+    group_attrs = {'name': groupname}
+    if ENABLE_ORGANIZATIONS.get():
+      group_attrs['organization'] = default_organization()
+
+    group, created = Group.objects.get_or_create(**group_attrs)
     if not user.groups.filter(name=group.name).exists():
       user.groups.add(group)
       user.save()