diff options
author | Jan Cholasta <jcholast@redhat.com> | 2011-11-01 08:58:05 -0400 |
---|---|---|
committer | Alexander Bokovoy <abokovoy@redhat.com> | 2012-01-02 11:51:26 +0300 |
commit | 9beb467d98cb16e09fcda5ebbeb27056dfff3a2d (patch) | |
tree | d374273454f5fa5627eb1fe83782c437cdbddde2 /tests | |
parent | 46d3abc450db20c3e4c0854dbf9e711f59db3bff (diff) | |
download | freeipa-9beb467d98cb16e09fcda5ebbeb27056dfff3a2d.tar.gz freeipa-9beb467d98cb16e09fcda5ebbeb27056dfff3a2d.tar.xz freeipa-9beb467d98cb16e09fcda5ebbeb27056dfff3a2d.zip |
Fix attempted write to attribute of read-only object.
Add new class "cachedproperty" for creating property-like attributes
that cache the return value of a method call.
Also fix few issues in the unit tests to enable them to succeed.
ticket 1959
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test_ipalib/test_plugable.py | 2 | ||||
-rw-r--r-- | tests/test_ipaserver/test_ldap.py | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tests/test_ipalib/test_plugable.py b/tests/test_ipalib/test_plugable.py index 23b733096..3355e057a 100644 --- a/tests/test_ipalib/test_plugable.py +++ b/tests/test_ipalib/test_plugable.py @@ -247,7 +247,7 @@ class test_Plugin(ClassChecker): info = 'whatever' e = raises(StandardError, check) assert str(e) == \ - "check.info attribute ('whatever') conflicts with Plugin logger" + "info is already bound to tests.test_ipalib.test_plugable.check()" def test_set_api(self): """ diff --git a/tests/test_ipaserver/test_ldap.py b/tests/test_ipaserver/test_ldap.py index abfd1be7f..1bbd94fb5 100644 --- a/tests/test_ipaserver/test_ldap.py +++ b/tests/test_ipaserver/test_ldap.py @@ -112,7 +112,15 @@ class test_ldap(object): myapi.register(service) myapi.register(service_show) myapi.finalize() - myapi.Backend.ldap2.connect(bind_dn="cn=Directory Manager", bind_pw='password') + + pwfile = api.env.dot_ipa + os.sep + ".dmpw" + if ipautil.file_exists(pwfile): + fp = open(pwfile, "r") + dm_password = fp.read().rstrip() + fp.close() + else: + raise nose.SkipTest("No directory manager password in %s" % pwfile) + myapi.Backend.ldap2.connect(bind_dn="cn=Directory Manager", bind_pw=dm_password) result = myapi.Command['service_show']('ldap/%s@%s' % (api.env.host, api.env.realm,)) entry_attrs = result['result'] |