From c92f77a93b789c31043d242a563d79fa46e44d84 Mon Sep 17 00:00:00 2001
From: David Whiteside <starboarder2001@gmail.com>
Date: Fri, 5 Feb 2021 21:46:12 -0700
Subject: [PATCH] switched from mockredis to fakeredis

---
 .travis.yml                      |  2 +-
 pivportal/lib/pivportal/rest.py  |  2 +-
 pivportal/test/test_pivportal.py | 13 +++----------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dc36e14..9b71b05 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ before_install:
 #    - sudo apt-get install libcurl4-gnutls-dev
 
 install:
-    - pip install nose flask flask-redis mockredispy coveralls PyYAML PyJWT
+    - pip install nose flask flask-redis fakeredis coveralls PyYAML PyJWT
 
 # Run Tests
 script:
diff --git a/pivportal/lib/pivportal/rest.py b/pivportal/lib/pivportal/rest.py
index e17ee33..0facf4c 100644
--- a/pivportal/lib/pivportal/rest.py
+++ b/pivportal/lib/pivportal/rest.py
@@ -12,7 +12,7 @@
 
 def create_app():
     app = Flask(__name__)
-    redis_store = FlaskRedis()
+    redis_store = FlaskRedis(decode_responses=True)
     redis_store.init_app(app)
     return (app, redis_store)
 
diff --git a/pivportal/test/test_pivportal.py b/pivportal/test/test_pivportal.py
index ae4a5ec..0eac3a1 100644
--- a/pivportal/test/test_pivportal.py
+++ b/pivportal/test/test_pivportal.py
@@ -7,15 +7,8 @@
 class TestCli(unittest.TestCase):
 
     def setUp(self):
-        from flask_redis import FlaskRedis
-        from mockredis import MockRedis
-        class MockRedisWrapper(MockRedis):
-            '''A wrapper to add the `from_url` classmethod'''
-            @classmethod
-            def from_url(cls, *args, **kwargs):
-                return cls()
-        pivportal.rest.redis_store = FlaskRedis.from_custom_provider(MockRedisWrapper)
-        pivportal.rest.redis_store.init_app(pivportal.rest.app)
+        import fakeredis
+        pivportal.rest.redis_store = fakeredis.FakeRedis(decode_responses=True)
 
     def test_dn_is_valid_withinvalidchars(self):
         assert pivportal.security.dn_is_valid("%#DW;$%&*") == False
@@ -179,4 +172,4 @@ def test_valid_client_cert_required_notvaliduser(self):
     def test_valid_client_cert_required_invalidusername(self):
         pivportal.security.dn_to_username = {'test_dn1': "testuser1.$#@#"}
         result = pivportal.rest.app.test_client().post("/api/rest/user/login", headers={'SSL_CLIENT_S_DN': 'testuser1.$#@#'})
-        assert result.status_code == 400
\ No newline at end of file
+        assert result.status_code == 400