瀏覽代碼

HUE-2436 [desktop] creating a test user should make sure to update is_superuser

Erick Tryzelaar 10 年之前
父節點
當前提交
9332b5a
共有 2 個文件被更改,包括 7 次插入3 次删除
  1. 2 2
      apps/zookeeper/src/zookeeper/rest.py
  2. 5 1
      desktop/core/src/desktop/lib/django_test_util.py

+ 2 - 2
apps/zookeeper/src/zookeeper/rest.py

@@ -15,9 +15,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import urllib2
-import urllib
 import json
+import urllib
+import urllib2
 
 from contextlib import contextmanager
 

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

@@ -56,10 +56,14 @@ def make_logged_in_client(username="test", password="test", is_superuser=True, r
     if recreate:
       user.delete()
       raise User.DoesNotExist
-  except User.DoesNotExist:    
+  except User.DoesNotExist:
     user = User.objects.create_user(username, username + '@localhost', password)
     user.is_superuser = is_superuser
     user.save()
+  else:
+    if user.is_superuser != is_superuser:
+      user.is_superuser = is_superuser
+      user.save()
 
   if groupname is not None:
     group, created = Group.objects.get_or_create(name=groupname)