IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Turn LDAPEntry.single_value into a dictionary-like property.

Browse Source 
This change makes single_value consistent with the raw property.

https://fedorahosted.org/freeipa/ticket/3521
This commit is contained in:
Jan Cholasta
2013-09-10 10:20:24 +00:00
committed by Petr Viktorin
parent 989493979d
commit df5f4ee81d
22 changed files with 152 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ipatests/test_install/test_updates.py
View File

@@ -112,7 +112,7 @@ class test_update(unittest.TestCase):
for item in ('top', 'nsContainer'):
self.assertTrue(item in objectclasses)
self.assertEqual(entry.single_value('cn'), 'test')
self.assertEqual(entry.single_value['cn'], 'test')
entries = self.ld.get_entries(
self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
@@ -123,10 +123,10 @@ class test_update(unittest.TestCase):
for item in ('top', 'person', 'posixaccount', 'krbprincipalaux', 'inetuser'):
self.assertTrue(item in objectclasses)
self.assertEqual(entry.single_value('loginshell'), '/bin/bash')
self.assertEqual(entry.single_value('sn'), 'User')
self.assertEqual(entry.single_value('uid'), 'tuser')
self.assertEqual(entry.single_value('cn'), 'Test User')
self.assertEqual(entry.single_value['loginshell'], '/bin/bash')
self.assertEqual(entry.single_value['sn'], 'User')
self.assertEqual(entry.single_value['uid'], 'tuser')
self.assertEqual(entry.single_value['cn'], 'Test User')
def test_2_update(self):
@@ -140,7 +140,7 @@ class test_update(unittest.TestCase):
self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1)
entry = entries[0]
self.assertEqual(entry.single_value('gecos'), 'Test User')
self.assertEqual(entry.single_value['gecos'], 'Test User')
def test_3_update(self):
"""
@@ -153,7 +153,7 @@ class test_update(unittest.TestCase):
self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1)
entry = entries[0]
self.assertEqual(entry.single_value('gecos'), 'Test User New')
self.assertEqual(entry.single_value['gecos'], 'Test User New')
def test_4_update(self):
"""
@@ -166,7 +166,7 @@ class test_update(unittest.TestCase):
self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1)
entry = entries[0]
self.assertEqual(entry.single_value('gecos'), 'Test User New2')
self.assertEqual(entry.single_value['gecos'], 'Test User New2')
def test_5_update(self):
"""
@@ -296,7 +296,7 @@ class test_update(unittest.TestCase):
for item in ('top', 'nsContainer'):
self.assertTrue(item in objectclasses)
self.assertEqual(entry.single_value('cn'), 'test')
self.assertEqual(entry.single_value['cn'], 'test')
entries = self.ld.get_entries(
self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
@@ -307,10 +307,10 @@ class test_update(unittest.TestCase):
for item in ('top', 'person', 'posixaccount', 'krbprincipalaux', 'inetuser'):
self.assertTrue(item in objectclasses)
self.assertEqual(entry.single_value('loginshell'), '/bin/bash')
self.assertEqual(entry.single_value('sn'), 'User')
self.assertEqual(entry.single_value('uid'), 'tuser')
self.assertEqual(entry.single_value('cn'), 'Test User')
self.assertEqual(entry.single_value['loginshell'], '/bin/bash')
self.assertEqual(entry.single_value['sn'], 'User')
self.assertEqual(entry.single_value['uid'], 'tuser')
self.assertEqual(entry.single_value['cn'], 'Test User')
# Now delete

4
ipatests/test_integration/tasks.py
View File

@@ -620,11 +620,11 @@ def wait_for_replication(ldap, timeout=30):
filter='(objectclass=nsds5replicationagreement)',
attrs_list=[status_attr, progress_attr])
log.debug('Replication agreements: \n%s', _entries_to_ldif(entries))
if any(not e.single_value(status_attr).startswith('0 ')
if any(not e.single_value[status_attr].startswith('0 ')
for e in entries):
log.error('Replication error')
continue
if any(e.single_value(progress_attr) == 'TRUE' for e in entries):
if any(e.single_value[progress_attr] == 'TRUE' for e in entries):
log.debug('Replication in progress (waited %s/%ss)',
i, timeout)
else:

2
ipatests/test_integration/test_caless.py
View File

@@ -313,7 +313,7 @@ class CALessBase(IntegrationTest):
ldap = host.ldap_connect()
entry = ldap.get_entry(DN(('cn', 'CACert'), ('cn', 'ipa'),
('cn', 'etc'), host.domain.basedn))
cert_from_ldap = entry.single_value('cACertificate')
cert_from_ldap = entry.single_value['cACertificate']
self.log.debug('CA cert from LDAP on %s:\n%r',
host, cert_from_ldap)
assert cert_from_ldap == expected_binary_cacrt

8
ipatests/test_ipaserver/test_ldap.py
View File

@@ -253,10 +253,10 @@ class test_LDAPEntry(object):
def test_single_value(self):
e = self.entry
assert e.single_value('cn') == self.cn1[0]
assert e.single_value('commonname') == self.cn1[0]
assert e.single_value('COMMONNAME', 'default') == self.cn1[0]
assert e.single_value('bad key', 'default') == 'default'
assert e.single_value['cn'] == self.cn1[0]
assert e.single_value['commonname'] == self.cn1[0]
assert e.single_value.get('COMMONNAME', 'default') == self.cn1[0]
assert e.single_value.get('bad key', 'default') == 'default'
def test_sync(self):
e = self.entry