diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test_xmlrpc/test_cert.py | 4 | ||||
-rw-r--r-- | tests/test_xmlrpc/test_host_plugin.py | 8 | ||||
-rw-r--r-- | tests/test_xmlrpc/test_service_plugin.py | 4 | ||||
-rw-r--r-- | tests/test_xmlrpc/xmlrpc_test.py | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/tests/test_xmlrpc/test_cert.py b/tests/test_xmlrpc/test_cert.py index 253373a2a..90809ab30 100644 --- a/tests/test_xmlrpc/test_cert.py +++ b/tests/test_xmlrpc/test_cert.py @@ -28,6 +28,7 @@ from nose.tools import assert_raises # pylint: disable=E0611 from xmlrpc_test import XMLRPC_test, assert_attr_equal from ipalib import api from ipalib import errors +from ipalib import x509 import tempfile from ipapython import ipautil import nose @@ -74,6 +75,8 @@ class test_cert(XMLRPC_test): # Create our temporary NSS database self.run_certutil(["-N", "-f", self.pwname]) + self.subject = DN(('CN', self.host_fqdn), x509.subject_base()) + def tearDown(self): super(test_cert, self).tearDown() shutil.rmtree(self.reqdir, ignore_errors=True) @@ -95,7 +98,6 @@ class test_cert(XMLRPC_test): """ host_fqdn = u'ipatestcert.%s' % api.env.domain service_princ = u'test/%s@%s' % (host_fqdn, api.env.realm) - subject = DN(('CN',host_fqdn),('O',api.env.realm)) def test_1_cert_add(self): """ diff --git a/tests/test_xmlrpc/test_host_plugin.py b/tests/test_xmlrpc/test_host_plugin.py index 2ef99c4a4..4ed4c17a8 100644 --- a/tests/test_xmlrpc/test_host_plugin.py +++ b/tests/test_xmlrpc/test_host_plugin.py @@ -252,7 +252,7 @@ class test_host(Declarative): valid_not_before=fuzzy_date, valid_not_after=fuzzy_date, subject=lambda x: DN(x) == \ - DN(('CN',api.env.host),('O',api.env.realm)), + DN(('CN',api.env.host),x509.subject_base()), serial_number=fuzzy_digits, serial_number_hex=fuzzy_hex, md5_fingerprint=fuzzy_hash, @@ -284,7 +284,7 @@ class test_host(Declarative): valid_not_before=fuzzy_date, valid_not_after=fuzzy_date, subject=lambda x: DN(x) == \ - DN(('CN',api.env.host),('O',api.env.realm)), + DN(('CN',api.env.host),x509.subject_base()), serial_number=fuzzy_digits, serial_number_hex=fuzzy_hex, md5_fingerprint=fuzzy_hash, @@ -483,7 +483,7 @@ class test_host(Declarative): valid_not_before=fuzzy_date, valid_not_after=fuzzy_date, subject=lambda x: DN(x) == \ - DN(('CN',api.env.host),('O',api.env.realm)), + DN(('CN',api.env.host),x509.subject_base()), serial_number=fuzzy_digits, serial_number_hex=fuzzy_hex, md5_fingerprint=fuzzy_hash, @@ -513,7 +513,7 @@ class test_host(Declarative): valid_not_before=fuzzy_date, valid_not_after=fuzzy_date, subject=lambda x: DN(x) == \ - DN(('CN',api.env.host),('O',api.env.realm)), + DN(('CN',api.env.host),x509.subject_base()), serial_number=fuzzy_digits, serial_number_hex=fuzzy_hex, md5_fingerprint=fuzzy_hash, diff --git a/tests/test_xmlrpc/test_service_plugin.py b/tests/test_xmlrpc/test_service_plugin.py index 2e51b2ccf..1c3a83a17 100644 --- a/tests/test_xmlrpc/test_service_plugin.py +++ b/tests/test_xmlrpc/test_service_plugin.py @@ -379,7 +379,7 @@ class test_service(Declarative): valid_not_before=fuzzy_date, valid_not_after=fuzzy_date, subject=lambda x: DN(x) == \ - DN(('CN',api.env.host),('O',api.env.realm)), + DN(('CN',api.env.host),x509.subject_base()), serial_number=fuzzy_digits, serial_number_hex=fuzzy_hex, md5_fingerprint=fuzzy_hash, @@ -407,7 +407,7 @@ class test_service(Declarative): valid_not_before=fuzzy_date, valid_not_after=fuzzy_date, subject=lambda x: DN(x) == \ - DN(('CN',api.env.host),('O',api.env.realm)), + DN(('CN',api.env.host),x509.subject_base()), serial_number=fuzzy_digits, serial_number_hex=fuzzy_hex, md5_fingerprint=fuzzy_hash, diff --git a/tests/test_xmlrpc/xmlrpc_test.py b/tests/test_xmlrpc/xmlrpc_test.py index 716ce03a0..a7cfb11b8 100644 --- a/tests/test_xmlrpc/xmlrpc_test.py +++ b/tests/test_xmlrpc/xmlrpc_test.py @@ -51,7 +51,7 @@ fuzzy_hash = Fuzzy('^([a-f0-9][a-f0-9]:)+[a-f0-9][a-f0-9]$', type=basestring) # Matches a date, like Tue Apr 26 17:45:35 2016 UTC fuzzy_date = Fuzzy('^[a-zA-Z]{3} [a-zA-Z]{3} \d{2} \d{2}:\d{2}:\d{2} \d{4} UTC$') -fuzzy_issuer = Fuzzy(type=basestring, test=lambda issuer: valid_issuer(issuer, api.env.realm)) +fuzzy_issuer = Fuzzy(type=basestring, test=lambda issuer: valid_issuer(issuer)) fuzzy_hex = Fuzzy('^0x[0-9a-fA-F]+$', type=basestring) |