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

Fixing tests and pinning versions

This commit is contained in:
kevgliss 2015-07-29 21:54:29 -07:00
parent 79353c142a
commit 2e1abdd2f1
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lemur/tests/test_certificates.py
View File

@ -27,7 +27,7 @@ def test_create_basic_csr():
country=u'US', country=u'US',
state=u'CA', state=u'CA',
location=u'A place', location=u'A place',
extensions=dict(subAltNames=[u'test.example.com', u'test2.example.com']) extensions=dict(names=dict(subAltNames=[u'test.example.com', u'test2.example.com']))
) )
csr, pem = create_csr(csr_config) csr, pem = create_csr(csr_config)
@ -56,15 +56,15 @@ def test_cert_is_san():
from lemur.tests.certs import INTERNAL_VALID_SAN_CERT, INTERNAL_VALID_LONG_CERT from lemur.tests.certs import INTERNAL_VALID_SAN_CERT, INTERNAL_VALID_LONG_CERT
from lemur.certificates.models import cert_is_san from lemur.certificates.models import cert_is_san
assert cert_is_san(INTERNAL_VALID_LONG_CERT) == None assert cert_is_san(INTERNAL_VALID_LONG_CERT) == None # noqa
assert cert_is_san(INTERNAL_VALID_SAN_CERT) == True assert cert_is_san(INTERNAL_VALID_SAN_CERT) == True # noqa
def test_cert_is_wildcard(): def test_cert_is_wildcard():
from lemur.tests.certs import INTERNAL_VALID_WILDCARD_CERT, INTERNAL_VALID_LONG_CERT from lemur.tests.certs import INTERNAL_VALID_WILDCARD_CERT, INTERNAL_VALID_LONG_CERT
from lemur.certificates.models import cert_is_wildcard from lemur.certificates.models import cert_is_wildcard
assert cert_is_wildcard(INTERNAL_VALID_WILDCARD_CERT) == True assert cert_is_wildcard(INTERNAL_VALID_WILDCARD_CERT) == True # noqa
assert cert_is_wildcard(INTERNAL_VALID_LONG_CERT) == None assert cert_is_wildcard(INTERNAL_VALID_LONG_CERT) == None # noqa
def test_cert_get_bitstrength(): def test_cert_get_bitstrength():

38
setup.py
View File

@ -22,27 +22,27 @@ from subprocess import check_output
ROOT = os.path.realpath(os.path.join(os.path.dirname(__file__))) ROOT = os.path.realpath(os.path.join(os.path.dirname(__file__)))
install_requires = [ install_requires = [
'Flask>=0.10.1', 'Flask==0.10.1',
'Flask-RESTful>=0.3.3', 'Flask-RESTful==0.3.3',
'Flask-SQLAlchemy>=1.0.5', 'Flask-SQLAlchemy==1.0.5',
'Flask-Script>=2.0.5', 'Flask-Script==2.0.5',
'Flask-Migrate>=1.4.0', 'Flask-Migrate==1.4.0',
'Flask-Bcrypt>=0.6.2', 'Flask-Bcrypt==0.6.2',
'Flask-Principal>=0.4.0', 'Flask-Principal==0.4.0',
'Flask-Mail==0.9.1', 'Flask-Mail==0.9.1',
'SQLAlchemy-Utils>=0.30.11', 'SQLAlchemy-Utils==0.30.11',
'BeautifulSoup4', 'BeautifulSoup4',
'requests>=2.7.0', 'requests==2.7.0',
'psycopg2>=2.6.1', 'psycopg2==2.6.1',
'arrow>=0.5.4', 'arrow==0.5.4',
'boto>=2.38.0', # we might make this optional 'boto==2.38.0', # we might make this optional
'six>=1.9.0', 'six==1.9.0',
'gunicorn>=19.3.0', 'gunicorn==19.3.0',
'pycrypto>=2.6.1', 'pycrypto==2.6.1',
'cryptography>=1.0dev', 'cryptography==1.0dev',
'pyopenssl>=0.15.1', 'pyopenssl==0.15.1',
'pyjwt>=1.0.1', 'pyjwt==1.0.1',
'xmltodict>=0.9.2' 'xmltodict==0.9.2'
] ]
tests_require = [ tests_require = [