浏览代码

[core] Fix LDAP and useradmin group list tests

Romain Rigaux 11 年之前
父节点
当前提交
7e5ffff994
共有 2 个文件被更改,包括 9 次插入6 次删除
  1. 7 4
      apps/useradmin/src/useradmin/tests.py
  2. 2 2
      desktop/core/src/desktop/conf.py

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

@@ -558,7 +558,8 @@ def test_list_for_autocomplete():
   groups = [user['name'] for user in content['groups']]
 
   assert_equal(['test_list_for_autocomplete2'], users)
-  assert_equal(['test_list_for_autocomplete'], groups)
+  assert_true('test_list_for_autocomplete' in groups, groups)
+  assert_true('test_list_for_autocomplete_other_group' in groups, groups)
 
   # c2 is in the same group as c1
   response = c2_same_group.get(reverse('useradmin.views.list_for_autocomplete'), HTTP_X_REQUESTED_WITH='XMLHttpRequest')
@@ -568,9 +569,10 @@ def test_list_for_autocomplete():
   groups = [user['name'] for user in content['groups']]
 
   assert_equal(['test_list_for_autocomplete'], users)
-  assert_equal(['test_list_for_autocomplete'], groups)
+  assert_true('test_list_for_autocomplete' in groups, groups)
+  assert_true('test_list_for_autocomplete_other_group' in groups, groups)
 
-  # c3 is alone
+  # c3 is alone except for groups
   response = c3_other_group.get(reverse('useradmin.views.list_for_autocomplete'), HTTP_X_REQUESTED_WITH='XMLHttpRequest')
   content = json.loads(response.content)
 
@@ -578,4 +580,5 @@ def test_list_for_autocomplete():
   groups = [user['name'] for user in content['groups']]
 
   assert_equal([], users)
-  assert_equal(['test_list_for_autocomplete_other_group'], groups)
+  assert_true('test_list_for_autocomplete' in groups, groups)
+  assert_true('test_list_for_autocomplete_other_group' in groups, groups)

+ 2 - 2
desktop/core/src/desktop/conf.py

@@ -788,8 +788,8 @@ def config_validator(user):
 
   if LDAP.LDAP_SERVERS.get():
     for ldap_record_key in LDAP.LDAP_SERVERS.get():
-      res.update(validate_ldap(user, LDAP.LDAP_SERVERS.get()[ldap_record_key]))
+      res.extend(validate_ldap(user, LDAP.LDAP_SERVERS.get()[ldap_record_key]))
   else:
-    res.update(validate_ldap(user, LDAP))
+    res.extend(validate_ldap(user, LDAP))
 
   return res