Fix unicode failures in Env tests and dn failures in XML-RPC tests

This commit is contained in:
Rob Crittenden
2010-02-22 14:29:26 -05:00
parent 0700f4d7ca
commit 766757e4d4
10 changed files with 55 additions and 54 deletions

View File

@@ -176,7 +176,7 @@ class test_group(Declarative):
truncated=False,
result=[
dict(
#dn=u'cn=%s,cn=groups,cn=accounts,%s' % (group1, api.env.basedn),
dn=u'cn=%s,cn=groups,cn=accounts,%s' % (group1, api.env.basedn),
cn=[group1],
description=[u'New desc 1'],
gidnumber=[fuzzy_digits],
@@ -293,7 +293,7 @@ class test_group(Declarative):
truncated=False,
result=[
dict(
#dn=u'cn=%s,cn=groups,cn=accounts,%s' % (group2, api.env.basedn),
dn=u'cn=%s,cn=groups,cn=accounts,%s' % (group2, api.env.basedn),
cn=[group2],
description=[u'New desc 2'],
),
@@ -312,32 +312,32 @@ class test_group(Declarative):
truncated=False,
result=[
{
#'dn': u'cn=admins,cn=groups,cn=accounts,%s' % api.env.basedn,
'dn': u'cn=admins,cn=groups,cn=accounts,%s' % api.env.basedn,
'member_user': [u'admin'],
'gidnumber': [fuzzy_digits],
'cn': [u'admins'],
'description': [u'Account administrators group'],
},
{
#'dn': u'cn=ipausers,cn=groups,cn=accounts,%s' % api.env.basedn,
'dn': u'cn=ipausers,cn=groups,cn=accounts,%s' % api.env.basedn,
'gidnumber': [fuzzy_digits],
'cn': [u'ipausers'],
'description': [u'Default group for all users'],
},
{
#'dn': u'cn=editors,cn=groups,cn=accounts,%s' % api.env.basedn,
'dn': u'cn=editors,cn=groups,cn=accounts,%s' % api.env.basedn,
'gidnumber': [fuzzy_digits],
'cn': [u'editors'],
'description': [u'Limited admins who can edit other users'],
},
dict(
#dn=u'cn=%s,cn=groups,cn=accounts,%s' % (group1, api.env.basedn),
dn=u'cn=%s,cn=groups,cn=accounts,%s' % (group1, api.env.basedn),
cn=[group1],
description=[u'New desc 1'],
gidnumber=[fuzzy_digits],
),
dict(
#dn=u'cn=%s,cn=groups,cn=accounts,%s' % (group2, api.env.basedn),
dn=u'cn=%s,cn=groups,cn=accounts,%s' % (group2, api.env.basedn),
cn=[group2],
description=[u'New desc 2'],
),

View File

@@ -148,7 +148,7 @@ class test_host(Declarative):
summary=u'1 host matched',
result=[
dict(
#dn=dn1,
dn=dn1,
fqdn=[fqdn1],
description=[u'Test host 1'],
l=[u'Undisclosed location 1'],
@@ -168,6 +168,7 @@ class test_host(Declarative):
summary=u'1 host matched',
result=[
dict(
dn=dn1,
cn=[fqdn1],
fqdn=[fqdn1],
description=[u'Test host 1'],

View File

@@ -165,7 +165,7 @@ class test_hostgroup(Declarative):
summary=u'1 hostgroup matched',
result=[
{
#'dn': dn1,
'dn': dn1,
'member_host': [u'testhost1.%s' % api.env.domain],
'cn': [hostgroup1],
'description': [u'Test hostgroup 1'],

View File

@@ -184,7 +184,7 @@ class test_rolegroup(Declarative):
summary=u'1 rolegroup matched',
result=[
{
#'dn': rolegroup1_dn,
'dn': rolegroup1_dn,
'cn': [rolegroup1],
'description': [u'rolegroup desc 1'],
'member_group': [group1],
@@ -203,7 +203,7 @@ class test_rolegroup(Declarative):
summary=u'1 rolegroup matched',
result=[
{
#'dn': rolegroup1_dn,
'dn': rolegroup1_dn,
'cn': [rolegroup1],
'description': [u'rolegroup desc 1'],
'member_group': [group1],
@@ -240,7 +240,7 @@ class test_rolegroup(Declarative):
summary=u'1 rolegroup matched',
result=[
{
#'dn': rolegroup1_dn,
'dn': rolegroup1_dn,
'cn': [rolegroup1],
'description': [u'rolegroup desc 1'],
'member_group': [group1],
@@ -259,13 +259,13 @@ class test_rolegroup(Declarative):
summary=u'2 rolegroups matched',
result=[
{
#'dn': rolegroup1_dn,
'dn': rolegroup1_dn,
'cn': [rolegroup1],
'description': [u'rolegroup desc 1'],
'member_group': [group1],
},
{
#'dn': rolegroup2_dn,
'dn': rolegroup2_dn,
'cn': [rolegroup2],
'description': [u'rolegroup desc 2'],
},
@@ -396,7 +396,7 @@ class test_rolegroup(Declarative):
summary=u'1 rolegroup matched',
result=[
{
#'dn': rolegroup2_dn,
'dn': rolegroup2_dn,
'cn': [rolegroup2],
'description': [u'rolegroup desc 2'],
},

View File

@@ -206,7 +206,7 @@ class test_taskgroup(Declarative):
summary=u'1 taskgroup matched',
result=[
{
#'dn': taskgroup1_dn,
'dn': taskgroup1_dn,
'cn': [taskgroup1],
'description': [u'Test desc 1'],
'member_rolegroup': [rolegroup1],
@@ -226,7 +226,7 @@ class test_taskgroup(Declarative):
summary=u'1 taskgroup matched',
result=[
{
#'dn': taskgroup1_dn,
'dn': taskgroup1_dn,
'cn': [taskgroup1],
'description': [u'Test desc 1'],
'member_rolegroup': [rolegroup1],
@@ -264,7 +264,7 @@ class test_taskgroup(Declarative):
summary=u'1 taskgroup matched',
result=[
{
#'dn': taskgroup1_dn,
'dn': taskgroup1_dn,
'cn': [taskgroup1],
'description': [u'Test desc 1'],
'member_rolegroup': [rolegroup1],
@@ -284,14 +284,14 @@ class test_taskgroup(Declarative):
summary=u'2 taskgroups matched',
result=[
{
#'dn': taskgroup1_dn,
'dn': taskgroup1_dn,
'cn': [taskgroup1],
'description': [u'Test desc 1'],
'member_rolegroup': [rolegroup1],
'member_group': [group1],
},
{
#'dn': taskgroup2_dn,
'dn': taskgroup2_dn,
'cn': [taskgroup2],
'description': [u'Test desc 2'],
},
@@ -401,7 +401,7 @@ class test_taskgroup(Declarative):
summary=u'1 taskgroup matched',
result=[
{
#'dn': taskgroup2_dn,
'dn': taskgroup2_dn,
'cn': [taskgroup2],
'description': [u'Test desc 2'],
},

View File

@@ -123,7 +123,7 @@ class test_user(Declarative):
expected=dict(
result=[
{
#'dn': u'uid=user1,cn=users,cn=accounts,' + api.env.basedn,
'dn': u'uid=tuser1,cn=users,cn=accounts,' + api.env.basedn,
'cn': [u'Test User1'],
'gecos': [user1],
'givenname': [u'Test'],
@@ -153,7 +153,7 @@ class test_user(Declarative):
expected=dict(
result=[
dict(
#dn=u'uid=tuser1,cn=users,cn=accounts,' + api.env.basedn,
dn=u'uid=tuser1,cn=users,cn=accounts,' + api.env.basedn,
givenname=[u'Test'],
homedirectory=[u'/home/tuser1'],
loginshell=[u'/bin/sh'],
@@ -177,7 +177,7 @@ class test_user(Declarative):
expected=dict(
result=[
dict(
#dn=u'uid=admin,cn=users,cn=accounts,' + api.env.basedn,
dn=u'uid=admin,cn=users,cn=accounts,' + api.env.basedn,
homedirectory=[u'/home/admin'],
loginshell=[u'/bin/bash'],
sn=[u'Administrator'],
@@ -185,7 +185,7 @@ class test_user(Declarative):
memberof_group=[u'admins'],
),
dict(
#dn=u'uid=tuser1,cn=users,cn=accounts,' + api.env.basedn,
dn=u'uid=tuser1,cn=users,cn=accounts,' + api.env.basedn,
givenname=[u'Test'],
homedirectory=[u'/home/tuser1'],
loginshell=[u'/bin/sh'],