瀏覽代碼

HUE-8530 [organization] Update tests and also fix bug in test login client

Romain 6 年之前
父節點
當前提交
c8e2ed10a6
共有 1 個文件被更改,包括 10 次插入1 次删除
  1. 10 1
      desktop/core/src/desktop/lib/django_test_util.py

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

@@ -63,7 +63,16 @@ def make_logged_in_client(username="test", password="test", is_superuser=True, r
       user.delete()
       user.delete()
       raise User.DoesNotExist
       raise User.DoesNotExist
   except User.DoesNotExist:
   except User.DoesNotExist:
-    user = User.objects.create_user(username, username + '@localhost', password)
+    user_attrs = {
+      'password': password
+    }
+    if ENABLE_ORGANIZATIONS.get():
+      user_attrs['email'] = username
+      user_attrs['organization'] = default_organization()
+    else:
+      user_attrs['username'] = username
+      user_attrs['email'] = username + '@localhost'
+    user = User.objects.create_user(**user_attrs)
     user.is_superuser = is_superuser
     user.is_superuser = is_superuser
     user.save()
     user.save()
   else:
   else: