summaryrefslogtreecommitdiffstats
path: root/tests/test_ipaserver
diff options
context:
space:
mode:
authorJohn Dennis <jdennis@redhat.com>2011-08-09 21:21:56 -0400
committerRob Crittenden <rcritten@redhat.com>2011-08-16 23:52:41 -0400
commit9df6a4ed8cfa21e398ccb054e7ef4aaf323bdd70 (patch)
tree85e549b842aa7c9cbef54f44abdae0f4130ec3d0 /tests/test_ipaserver
parent97f0671ce9dd1d260fea4e95f6e6e017a1ef1048 (diff)
downloadfreeipa-9df6a4ed8cfa21e398ccb054e7ef4aaf323bdd70.zip
freeipa-9df6a4ed8cfa21e398ccb054e7ef4aaf323bdd70.tar.gz
freeipa-9df6a4ed8cfa21e398ccb054e7ef4aaf323bdd70.tar.xz
ticket 1600 - convert unittests to use DN objects
We have a larger goal of replacing all DN creation via string formatting/concatenation with DN object operations because string operations are not a safe way to form a DN nor to compare a DN. This work needs to be broken into smaller chunks for easier review and testing. Addressing the unit tests first makes sense because we don't want to be modifying both the core code and the tests used to verify the core code simultaneously. If we modify the unittests first with existing core code and no regressions are found then we can move on to modifying parts of the core code with the belief the unittests can validate the changes in the core code. Also by doing the unittests first we also help to validate the DN objects are working correctly (although they do have an extensive unittest). The fundamental changes are: * replace string substitution & concatenation with DN object constructor * when comparing dn's the comparision is done after promotion to a DN object, then two DN objects are compared * when a list of string dn's are to be compared a new list is formed where each string dn is replaced by a DN object * because the unittest framework accepts a complex data structure of expected values where dn's are represeted as strings the unittest needs to express the expected value of a dn as a callable object (e.g. a lambda expression) which promotes the dn string to a DN object in order to do the comparision.
Diffstat (limited to 'tests/test_ipaserver')
-rw-r--r--tests/test_ipaserver/test_ldap.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/test_ipaserver/test_ldap.py b/tests/test_ipaserver/test_ldap.py
index 299d439..568a37a 100644
--- a/tests/test_ipaserver/test_ldap.py
+++ b/tests/test_ipaserver/test_ldap.py
@@ -33,6 +33,7 @@ from ipalib.plugins.host import host
import nss.nss as nss
from ipalib import api, x509, create_api
from ipapython import ipautil
+from ipalib.dn import *
class test_ldap(object):
"""
@@ -44,7 +45,8 @@ class test_ldap(object):
self.ldapuri = 'ldap://%s' % api.env.host
self.ccache = '/tmp/krb5cc_%d' % os.getuid()
nss.nss_init_nodb()
- self.dn = 'krbprincipalname=ldap/%s@%s,cn=services,cn=accounts,%s' % (api.env.host, api.env.realm, api.env.basedn)
+ self.dn = str(DN(('krbprincipalname','ldap/%s@%s' % (api.env.host, api.env.realm)),
+ ('cn','services'),('cn','accounts'),api.env.basedn))
def tearDown(self):
if self.conn: