From ee446ff148b8ac7e8c713b4a26ccf3ab09800209 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Fri, 18 Dec 2009 10:57:40 -0500 Subject: Remove hardcoded domain, example.com --- tests/test_xmlrpc/test_hostgroup_plugin.py | 6 +++--- tests/test_xmlrpc/test_user_plugin.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/test_xmlrpc/test_hostgroup_plugin.py b/tests/test_xmlrpc/test_hostgroup_plugin.py index 6f7355080..3fef9b4e0 100644 --- a/tests/test_xmlrpc/test_hostgroup_plugin.py +++ b/tests/test_xmlrpc/test_hostgroup_plugin.py @@ -148,7 +148,7 @@ class test_hostgroup(Declarative): summary=None, result={ 'dn': dn1, - 'member host': [u'testhost1.example.com'], + 'member host': [u'testhost1.%s' % api.env.domain], 'cn': [hostgroup1], 'description': [u'Test hostgroup 1'], }, @@ -165,7 +165,7 @@ class test_hostgroup(Declarative): summary=u'1 hostgroup matched', result=[ { - 'member host': [u'testhost1.example.com'], + 'member host': [u'testhost1.%s' % api.env.domain], 'cn': [hostgroup1], 'description': [u'Test hostgroup 1'], }, @@ -197,7 +197,7 @@ class test_hostgroup(Declarative): summary=None, result={ 'dn': dn1, - 'member host': [u'testhost1.example.com'], + 'member host': [u'testhost1.%s' % api.env.domain], 'cn': [hostgroup1], 'description': [u'Updated hostgroup 1'], }, diff --git a/tests/test_xmlrpc/test_user_plugin.py b/tests/test_xmlrpc/test_user_plugin.py index b15e18cc8..7dfafc730 100644 --- a/tests/test_xmlrpc/test_user_plugin.py +++ b/tests/test_xmlrpc/test_user_plugin.py @@ -28,7 +28,7 @@ from tests.test_xmlrpc import objectclasses 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' @@ -103,7 +103,7 @@ class test_user(Declarative): ), expected=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'], homedirectory=[u'/home/tuser1'], loginshell=[u'/bin/sh'], @@ -242,7 +242,7 @@ class test_user(Declarative): command=('user_show', [user1], {}), expected=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'], homedirectory=[u'/home/tuser1'], loginshell=[u'/bin/sh'], -- cgit