diff options
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 23b73309..3355e057 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 abfd1be7..1bbd94fb 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'] |