mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2026-08-13 06:25:00 -05:00
tests: Create the testing service certificate on demand
Replace the make-testcert command with a module that creates the certificate when it is first needed. As a result the tests are more self-contained, and can be run from a read-only location (such as installed from a system package). Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
@@ -28,11 +28,12 @@ from ipapython import ipautil
|
||||
from ipalib import api, errors, x509
|
||||
from ipapython.dn import DN
|
||||
from nose.tools import raises, assert_raises
|
||||
from nose.plugins.skip import Skip, SkipTest
|
||||
from nose.plugins.skip import SkipTest
|
||||
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, XMLRPC_test,
|
||||
fuzzy_uuid, fuzzy_digits, fuzzy_hash, fuzzy_date, fuzzy_issuer,
|
||||
fuzzy_hex)
|
||||
from ipatests.test_xmlrpc import objectclasses
|
||||
from ipatests.test_xmlrpc.testcert import get_testcert
|
||||
import base64
|
||||
|
||||
|
||||
@@ -55,13 +56,6 @@ dn4 = DN(('fqdn',fqdn4),('cn','computers'),('cn','accounts'),
|
||||
api.env.basedn)
|
||||
invalidfqdn1 = u'foo_bar.lab.%s' % api.env.domain
|
||||
|
||||
# We can use the same cert we generated for the service tests
|
||||
fd = open('ipatests/test_xmlrpc/service.crt', 'r')
|
||||
servercert = fd.readlines()
|
||||
servercert = ''.join(servercert)
|
||||
servercert = x509.strip_header(servercert)
|
||||
fd.close()
|
||||
|
||||
sshpubkey = u'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGAX3xAeLeaJggwTqMjxNwa6XHBUAikXPGMzEpVrlLDCZtv00djsFTBi38PkgxBJVkgRWMrcBsr/35lq7P6w8KGIwA8GI48Z0qBS2NBMJ2u9WQ2hjLN6GdMlo77O0uJY3251p12pCVIS/bHRSq8kHO2No8g7KA9fGGcagPfQH+ee3t7HUkpbQkFTmbPPN++r3V8oVUk5LxbryB3UIIVzNmcSIn3JrXynlvui4MixvrtX6zx+O/bBo68o8/eZD26QrahVbA09fivrn/4h3TM019Eu/c2jOdckfU3cHUV/3Tno5d6JicibyaoDDK7S/yjdn5jhaz8MSEayQvFkZkiF0L public key test'
|
||||
sshpubkeyfp = u'13:67:6B:BF:4E:A2:05:8E:AE:25:8B:A1:31:DE:6F:1B public key test (ssh-rsa)'
|
||||
|
||||
@@ -254,7 +248,7 @@ class test_host(Declarative):
|
||||
dict(
|
||||
desc='Update %r' % fqdn1,
|
||||
command=('host_mod', [fqdn1], dict(description=u'Updated host 1',
|
||||
usercertificate=servercert)),
|
||||
usercertificate=get_testcert())),
|
||||
expected=dict(
|
||||
value=fqdn1,
|
||||
summary=u'Modified host "%s"' % fqdn1,
|
||||
@@ -264,7 +258,7 @@ class test_host(Declarative):
|
||||
l=[u'Undisclosed location 1'],
|
||||
krbprincipalname=[u'host/%s@%s' % (fqdn1, api.env.realm)],
|
||||
managedby_host=[u'%s' % fqdn1],
|
||||
usercertificate=[base64.b64decode(servercert)],
|
||||
usercertificate=[base64.b64decode(get_testcert())],
|
||||
valid_not_before=fuzzy_date,
|
||||
valid_not_after=fuzzy_date,
|
||||
subject=DN(('CN',api.env.host),x509.subject_base()),
|
||||
@@ -295,7 +289,7 @@ class test_host(Declarative):
|
||||
has_keytab=False,
|
||||
has_password=False,
|
||||
managedby_host=[u'%s' % fqdn1],
|
||||
usercertificate=[base64.b64decode(servercert)],
|
||||
usercertificate=[base64.b64decode(get_testcert())],
|
||||
valid_not_before=fuzzy_date,
|
||||
valid_not_after=fuzzy_date,
|
||||
subject=DN(('CN',api.env.host),x509.subject_base()),
|
||||
@@ -493,7 +487,7 @@ class test_host(Declarative):
|
||||
l=[u'Undisclosed location 1'],
|
||||
krbprincipalname=[u'host/%s@%s' % (fqdn1, api.env.realm)],
|
||||
managedby_host=[u'%s' % fqdn1],
|
||||
usercertificate=[base64.b64decode(servercert)],
|
||||
usercertificate=[base64.b64decode(get_testcert())],
|
||||
valid_not_before=fuzzy_date,
|
||||
valid_not_after=fuzzy_date,
|
||||
subject=DN(('CN',api.env.host),x509.subject_base()),
|
||||
@@ -522,7 +516,7 @@ class test_host(Declarative):
|
||||
l=[u'Undisclosed location 1'],
|
||||
krbprincipalname=[u'host/%s@%s' % (fqdn1, api.env.realm)],
|
||||
managedby_host=[u'%s' % fqdn1],
|
||||
usercertificate=[base64.b64decode(servercert)],
|
||||
usercertificate=[base64.b64decode(get_testcert())],
|
||||
valid_not_before=fuzzy_date,
|
||||
valid_not_after=fuzzy_date,
|
||||
subject=DN(('CN',api.env.host),x509.subject_base()),
|
||||
@@ -560,7 +554,7 @@ class test_host(Declarative):
|
||||
l=[u'Undisclosed location 1'],
|
||||
krbprincipalname=[u'host/%s@%s' % (fqdn1, api.env.realm)],
|
||||
managedby_host=[u'%s' % fqdn1],
|
||||
usercertificate=[base64.b64decode(servercert)],
|
||||
usercertificate=[base64.b64decode(get_testcert())],
|
||||
valid_not_before=fuzzy_date,
|
||||
valid_not_after=fuzzy_date,
|
||||
subject=DN(('CN',api.env.host),x509.subject_base()),
|
||||
|
||||
Reference in New Issue
Block a user