From 0e4e1f4bbd8c6e5dd52995b059a87b3c3b3d8bda Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Wed, 20 Oct 2010 13:14:22 -0400 Subject: [PATCH] Fix two failing tests. The first test is a mismatch in the sample output of an exception. The second test adds certificate information output to the service plugin. --- ipalib/errors.py | 2 +- tests/test_xmlrpc/test_service_plugin.py | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ipalib/errors.py b/ipalib/errors.py index 413e6e6f8..bce433d2a 100644 --- a/ipalib/errors.py +++ b/ipalib/errors.py @@ -1270,7 +1270,7 @@ class CertificateFormatError(CertificateError): >>> raise CertificateFormatError(error=u'improperly formated DER-encoded certificate') Traceback (most recent call last): ... - CertificateFormatError: improperly formated DER-encoded certificate + CertificateFormatError: Certificate format error: improperly formated DER-encoded certificate """ diff --git a/tests/test_xmlrpc/test_service_plugin.py b/tests/test_xmlrpc/test_service_plugin.py index 441cdb290..1427169e1 100644 --- a/tests/test_xmlrpc/test_service_plugin.py +++ b/tests/test_xmlrpc/test_service_plugin.py @@ -251,6 +251,15 @@ class test_host(Declarative): krbprincipalname=[service1], has_keytab=False, managedby_host=[fqdn1], + # These values come from the servercert that is in this + # test case. + valid_not_before=u'Mon Aug 09 15:02:27 2010 UTC', + valid_not_after=u'Sun Aug 09 15:02:27 2020 UTC', + subject=u'CN=puma.greyoak.com,O=IPA', + serial_number=u'1022', + md5_fingerprint=u'ef:63:31:e4:33:54:8d:fd:fe:c8:66:57:09:03:5f:09', + sha1_fingerprint=u'e3:33:2c:d9:7c:e9:77:74:2a:ac:3b:b8:76:b0:86:29:98:43:58:11', + issuer=u'CN=IPA Test Certificate Authority', ), ), ),