Make flake8 test pass

This commit is contained in:
Nicholas Charriere 2016-07-18 11:52:37 -07:00
parent bc52ebb278
commit db1ef7673e
2 changed files with 10 additions and 8 deletions

View file

@ -12,7 +12,6 @@ app.secret_key = os.environ.get('SECRET_KEY', 'Secret Key')
app.config.update(
dict(STATIC_URL=os.environ.get('STATIC_URL', 'static')))
id_ = lambda: uuid.uuid4().hex
redis_host = os.environ.get('REDIS_HOST', 'localhost')
redis_client = redis.StrictRedis(host=redis_host, port=6379, db=0)
@ -23,8 +22,12 @@ time_conversion = {
}
def _id():
return uuid.uuid4().hex
def set_password(password, ttl):
key = id_()
key = _id()
redis_client.set(key, password)
redis_client.expire(key, ttl)
return key
@ -41,14 +44,14 @@ def clean_input():
Make sure we're not getting bad data from the front end,
format data to be machine readable
"""
if not 'password' in request.form:
if 'password' not in request.form:
abort(400)
if not 'ttl' in request.form:
if 'ttl' not in request.form:
abort(400)
time_period = request.form['ttl'].lower()
if not time_period in time_conversion:
if time_period not in time_conversion:
abort(400)
return time_conversion[time_period], request.form['password']

View file

@ -3,7 +3,7 @@ from unittest import TestCase
from werkzeug.exceptions import ClientDisconnected
#noinspection PyPep8Naming
# noinspection PyPep8Naming
import snappass.main as snappass
__author__ = 'davedash'
@ -45,7 +45,7 @@ class SnapPassTestCase(TestCase):
class SnapPassRoutesTestCase(TestCase):
#noinspection PyPep8Naming
# noinspection PyPep8Naming
def setUp(self):
snappass.app.config['TESTING'] = True
self.app = snappass.app.test_client()
@ -59,4 +59,3 @@ class SnapPassRoutesTestCase(TestCase):
if __name__ == '__main__':
unittest.main()