浏览代码

HUE-791 [core] Adding Django Transaction middleware

Fixing a test wrongly failing after the change.
Romain Rigaux 13 年之前
父节点
当前提交
3d4184e
共有 2 个文件被更改,包括 5 次插入3 次删除
  1. 4 3
      apps/useradmin/src/useradmin/tests.py
  2. 1 0
      desktop/core/src/desktop/settings.py

+ 4 - 3
apps/useradmin/src/useradmin/tests.py

@@ -44,7 +44,7 @@ def reset_all_users():
     user.delete()
 
 def reset_all_groups():
-  """Reset to a clean state by deleting all users"""
+  """Reset to a clean state by deleting all groups"""
 
   useradmin.conf.DEFAULT_USER_GROUP.set_for_testing(None)
   for grp in Group.objects.all():
@@ -154,14 +154,16 @@ def test_group_permissions():
   response = c1.get('/useradmin/users')
   assert_true('You do not have permission to access the Useradmin application.' in response.content)
 
-
 def test_default_group():
   reset_all_users()
   reset_all_groups()
 
   c = make_logged_in_client(username='test', is_superuser=True)
 
+  Group.objects.create(name="test_default")
+
   # Try deleting the default group
+  assert_true(Group.objects.filter(name='test_default').exists())
   useradmin.conf.DEFAULT_USER_GROUP.set_for_testing('test_default')
   response = c.post('/useradmin/groups/delete/test_default')
   assert_true('default user group may not be deleted' in response.content)
@@ -235,7 +237,6 @@ def test_group_admin():
   assert_true("Group name may only contain letters" in response.content)
   assert_equal(len(Group.objects.all()), group_count)
 
-
 def test_user_admin():
   FUNNY_NAME = '~`!@#$%^&*()_-+={}[]|\;"<>?/,.'
   FUNNY_NAME_QUOTED = urllib.quote(FUNNY_NAME)

+ 1 - 0
desktop/core/src/desktop/settings.py

@@ -116,6 +116,7 @@ MIDDLEWARE_CLASSES = [
     'desktop.middleware.ExceptionMiddleware',
     'desktop.middleware.ClusterMiddleware',
     'desktop.middleware.AppSpecificMiddleware',
+    'django.middleware.transaction.TransactionMiddleware',
     # 'debug_toolbar.middleware.DebugToolbarMiddleware'
 ]