From df5f4ee81d1aff1122dd92ab1b56eb335294c3a7 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Tue, 10 Sep 2013 10:20:24 +0000 Subject: Turn LDAPEntry.single_value into a dictionary-like property. This change makes single_value consistent with the raw property. https://fedorahosted.org/freeipa/ticket/3521 --- ipatests/test_integration/tasks.py | 4 ++-- ipatests/test_integration/test_caless.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ipatests/test_integration') diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py index d3025876..cee54768 100644 --- a/ipatests/test_integration/tasks.py +++ b/ipatests/test_integration/tasks.py @@ -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: diff --git a/ipatests/test_integration/test_caless.py b/ipatests/test_integration/test_caless.py index 9866705b..87c523a4 100644 --- a/ipatests/test_integration/test_caless.py +++ b/ipatests/test_integration/test_caless.py @@ -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 -- cgit