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

Adding plugin tests. (#385)

Browse Source 
* Adding plugin tests.

* Fixing some python 2/3 incompatibilities.
This commit is contained in:
kevgliss
2016-07-01 11:32:19 -07:00
committed by GitHub
parent a8040777b3
commit 300e2d0b7d
14 changed files with 118 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lemur/plugins/lemur_aws/iam.py
View File

@ -57,7 +57,7 @@ def get_all_server_certs(account_number):
result = response['list_server_certificates_response']['list_server_certificates_result']
for cert in result['server_certificate_metadata_list']:
certs.append(cert['arn'])
certs.append(cert['server_certificate_metadata']['arn'])
if result['is_truncated'] == 'true':
marker = result['marker']

12
lemur/plugins/lemur_aws/tests/test_iam.py
View File

@ -1,7 +1,5 @@
from moto import mock_iam, mock_sts
from lemur.certificates.models import Certificate
from lemur.tests.vectors import EXTERNAL_VALID_STR, PRIVATE_KEY_STR
@ -15,8 +13,7 @@ def test_get_name_from_arn():
@mock_iam()
def test_get_all_server_certs(app):
from lemur.plugins.lemur_aws.iam import upload_cert, get_all_server_certs
cert = Certificate(EXTERNAL_VALID_STR)
upload_cert('123456789012', cert, PRIVATE_KEY_STR)
upload_cert('123456789012', 'testCert', EXTERNAL_VALID_STR.decode('utf-8'), PRIVATE_KEY_STR.decode('utf-8'))
certs = get_all_server_certs('123456789012')
assert len(certs) == 1
@ -25,7 +22,6 @@ def test_get_all_server_certs(app):
@mock_iam()
def test_get_cert_from_arn(app):
from lemur.plugins.lemur_aws.iam import upload_cert, get_cert_from_arn
cert = Certificate(EXTERNAL_VALID_STR)
upload_cert('123456789012', cert, PRIVATE_KEY_STR)
body, chain = get_cert_from_arn('arn:aws:iam::123456789012:server-certificate/tttt2.netflixtest.net-NetflixInc-20150624-20150625')
assert body.replace('\n', '') == EXTERNAL_VALID_STR.replace('\n', '')
upload_cert('123456789012', 'testCert', EXTERNAL_VALID_STR.decode('utf-8'), PRIVATE_KEY_STR.decode('utf-8'))
body, chain = get_cert_from_arn('arn:aws:iam::123456789012:server-certificate/testCert')
assert body.replace('\n', '') == EXTERNAL_VALID_STR.decode('utf-8').replace('\n', '')

11
lemur/plugins/lemur_aws/tests/test_s3.py
View File

@ -1,11 +0,0 @@
from moto import mock_s3
import boto
@mock_s3()
def test_get_name_from_arn():
conn = boto.connect_s3()
conn.create_bucket('test')
from lemur.plugins.lemur_aws.s3 import write_to_s3
write_to_s3('11111111111111', 'test', 'key', 'body')
assert conn.get_bucket('test').get_key('key').get_contents_as_string() == 'body'