Remove hardcoded domain, example.com

This commit is contained in:
Rob Crittenden 2009-12-18 10:57:40 -05:00 committed by Jason Gerard DeRose
parent e83c54587f
commit ee446ff148
2 changed files with 6 additions and 6 deletions

View File

@ -148,7 +148,7 @@ class test_hostgroup(Declarative):
summary=None, summary=None,
result={ result={
'dn': dn1, 'dn': dn1,
'member host': [u'testhost1.example.com'], 'member host': [u'testhost1.%s' % api.env.domain],
'cn': [hostgroup1], 'cn': [hostgroup1],
'description': [u'Test hostgroup 1'], 'description': [u'Test hostgroup 1'],
}, },
@ -165,7 +165,7 @@ class test_hostgroup(Declarative):
summary=u'1 hostgroup matched', summary=u'1 hostgroup matched',
result=[ result=[
{ {
'member host': [u'testhost1.example.com'], 'member host': [u'testhost1.%s' % api.env.domain],
'cn': [hostgroup1], 'cn': [hostgroup1],
'description': [u'Test hostgroup 1'], 'description': [u'Test hostgroup 1'],
}, },
@ -197,7 +197,7 @@ class test_hostgroup(Declarative):
summary=None, summary=None,
result={ result={
'dn': dn1, 'dn': dn1,
'member host': [u'testhost1.example.com'], 'member host': [u'testhost1.%s' % api.env.domain],
'cn': [hostgroup1], 'cn': [hostgroup1],
'description': [u'Updated hostgroup 1'], 'description': [u'Updated hostgroup 1'],
}, },

View File

@ -28,7 +28,7 @@ from tests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
user_memberof = (u'cn=ipausers,cn=groups,cn=accounts,dc=example,dc=com',) user_memberof = (u'cn=ipausers,cn=groups,cn=accounts,%s' % api.env.basedn,)
user1=u'tuser1' user1=u'tuser1'
@ -103,7 +103,7 @@ class test_user(Declarative):
), ),
expected=dict( expected=dict(
result=dict( result=dict(
dn=u'uid=tuser1,cn=users,cn=accounts,dc=example,dc=com', dn=u'uid=tuser1,cn=users,cn=accounts,%s' % api.env.basedn,
givenname=[u'Test'], givenname=[u'Test'],
homedirectory=[u'/home/tuser1'], homedirectory=[u'/home/tuser1'],
loginshell=[u'/bin/sh'], loginshell=[u'/bin/sh'],
@ -242,7 +242,7 @@ class test_user(Declarative):
command=('user_show', [user1], {}), command=('user_show', [user1], {}),
expected=dict( expected=dict(
result=dict( result=dict(
dn=u'uid=tuser1,cn=users,cn=accounts,dc=example,dc=com', dn=u'uid=tuser1,cn=users,cn=accounts,%s' % api.env.basedn,
givenname=[u'Finkle'], givenname=[u'Finkle'],
homedirectory=[u'/home/tuser1'], homedirectory=[u'/home/tuser1'],
loginshell=[u'/bin/sh'], loginshell=[u'/bin/sh'],