simono41/snappass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Migrate to fakeredis from mockredispy (#108)

Browse source
This commit is contained in:
vin01 2019-08-09 15:37:03 +00:00 committed by Jon Parise
parent f7fbb4575c
commit 054c61ae89
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dev-requirements.txt
View file

@ -1,6 +1,6 @@
pytest==3.6.3 pytest==3.6.3
pytest-cov==2.5.1 pytest-cov==2.5.1
mockredispy==2.9.3 fakeredis==0.7.0
coverage==4.5.1 coverage==4.5.1
flake8==3.5.0 flake8==3.5.0
tox==3.1.2 tox==3.1.2

4
snappass/main.py
View file

@ -25,8 +25,8 @@ app.config.update(
# Initialize Redis # Initialize Redis
if os.environ.get('MOCK_REDIS'): if os.environ.get('MOCK_REDIS'):
from mockredis import mock_strict_redis_client from fakeredis import FakeStrictRedis
redis_client = mock_strict_redis_client() redis_client = FakeStrictRedis()
elif os.environ.get('REDIS_URL'): elif os.environ.get('REDIS_URL'):
redis_client = redis.StrictRedis.from_url(os.environ.get('REDIS_URL')) redis_client = redis.StrictRedis.from_url(os.environ.get('REDIS_URL'))
else: else:

7
tests.py
View file

@ -6,7 +6,7 @@ from unittest import TestCase
from cryptography.fernet import Fernet from cryptography.fernet import Fernet
from werkzeug.exceptions import BadRequest from werkzeug.exceptions import BadRequest
from mockredis import mock_strict_redis_client from fakeredis import FakeStrictRedis
# noinspection PyPep8Naming # noinspection PyPep8Naming
import snappass.main as snappass import snappass.main as snappass
@ -16,7 +16,7 @@ __author__ = 'davedash'
class SnapPassTestCase(TestCase): class SnapPassTestCase(TestCase):
@patch('redis.client.StrictRedis', mock_strict_redis_client) @patch('redis.client.StrictRedis', FakeStrictRedis)
def test_get_password(self): def test_get_password(self):
password = "melatonin overdose 1337!$" password = "melatonin overdose 1337!$"
key = snappass.set_password(password, 30) key = snappass.set_password(password, 30)
@ -94,9 +94,6 @@ class SnapPassTestCase(TestCase):
password = 'open sesame' password = 'open sesame'
key = snappass.set_password(password, 1) key = snappass.set_password(password, 1)
time.sleep(1.5) time.sleep(1.5)
# Expire functionality must be explicitly invoked using do_expire(time).
# mockredis does not support automatic expiration at this time
snappass.redis_client.do_expire()
self.assertIsNone(snappass.get_password(key)) self.assertIsNone(snappass.get_password(key))