Browse Source

HUE-8530 [organization] Fix rebasing issues

Romain 5 years ago
parent
commit
9928284e28

File diff suppressed because it is too large
+ 1 - 2
apps/oozie/src/oozie/models2_tests.py


+ 2 - 0
apps/oozie/src/oozie/tests.py

@@ -300,6 +300,8 @@ class OozieMockBase(object):
     grant_access("test", "test", "oozie")
     grant_access("test", "test", "oozie")
     add_to_group("test")
     add_to_group("test")
     self.user = User.objects.get(username='test')
     self.user = User.objects.get(username='test')
+    self.user.email = 'test@localhost'
+    self.user.save()
 
 
     self.wf = create_workflow(self.c, self.user)
     self.wf = create_workflow(self.c, self.user)
     self.original_fs = originalCluster.FS_CACHE["default"]
     self.original_fs = originalCluster.FS_CACHE["default"]

+ 2 - 2
desktop/core/src/desktop/lib/django_test_util.py

@@ -22,8 +22,8 @@ import json
 import django.test.client
 import django.test.client
 import nose.tools
 import nose.tools
 
 
-from useradmin.models import User, Group
-from useradmin.organization import Organization
+from useradmin.models import User, Group, Organization
+
 
 
 
 
 class Client(django.test.client.Client):
 class Client(django.test.client.Client):

+ 2 - 0
desktop/core/src/desktop/lib/fs/proxyfs.py

@@ -22,6 +22,8 @@ from builtins import object
 import logging
 import logging
 import sys
 import sys
 
 
+from useradmin.models import User
+
 from desktop.auth.backend import is_admin
 from desktop.auth.backend import is_admin
 from desktop.conf import DEFAULT_USER, ENABLE_ORGANIZATIONS
 from desktop.conf import DEFAULT_USER, ENABLE_ORGANIZATIONS
 
 

Some files were not shown because too many files changed in this diff