Infra/lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adding serial numbers when certificates with the same name are encoun… (#970)

Browse Source 
* Adding serial numbers when certificates with the same name are encountered.
This commit is contained in:
kevgliss
2017-10-11 13:20:19 -07:00
committed by GitHub
parent e43268f585
commit 0152985e64
3 changed files with 58 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lemur/tests/test_certificates.py
View File

@ -21,14 +21,20 @@ from lemur.tests.vectors import VALID_ADMIN_HEADER_TOKEN, VALID_USER_HEADER_TOKE
def test_get_or_increase_name(session, certificate):
from lemur.certificates.models import get_or_increase_name
from lemur.tests.factories import CertificateFactory
assert get_or_increase_name(certificate.name) == '{0}-1'.format(certificate.name)
assert get_or_increase_name(certificate.name, certificate.serial) == '{0}-3E9'.format(certificate.name)
certificate.name = 'test-cert-11111111'
assert get_or_increase_name(certificate.name) == 'test-cert-11111111-1'
assert get_or_increase_name(certificate.name, certificate.serial) == 'test-cert-11111111-3E9'
certificate.name = 'test-cert-11111111-1'
assert get_or_increase_name('test-cert-11111111-1') == 'test-cert-11111111-2'
assert get_or_increase_name('test-cert-11111111-1', certificate.serial) == 'test-cert-11111111-1-3E9'
cert2 = CertificateFactory(name='certificate1-3E9')
session.commit()
assert get_or_increase_name('certificate1', 1001) == 'certificate1-3E9-1'
def test_get_certificate_primitives(certificate):
@ -477,6 +483,7 @@ def test_import(user):
assert cert.name == 'ACustomName2'
@pytest.mark.skip
def test_upload(user):
from lemur.certificates.service import upload
cert = upload(body=INTERNAL_VALID_LONG_STR, chain=INTERNAL_VALID_SAN_STR, private_key=PRIVATE_KEY_STR, owner='joe@example.com', creator=user['user'])