Merge branch 'master' into allow-cert-deletion

2019-03-06 10:59:33 -08:00
parent 45cb0f0513 b5d255d7c9
commit 43b1d6217a
3 changed files with 5 additions and 5 deletions
--- a/lemur/tests/conftest.py
+++ b/lemur/tests/conftest.py
@ -43,7 +43,7 @@ def app(request):
    Creates a new Flask application for a test duration.
    Uses application factory `create_app`.
    """
-    _app = create_app(os.path.dirname(os.path.realpath(__file__)) + '/conf.py')
+    _app = create_app(config_path=os.path.dirname(os.path.realpath(__file__)) + '/conf.py')
    ctx = _app.app_context()
    ctx.push()