From 3317a021203e65829f345e193f12e01c306c0817 Mon Sep 17 00:00:00 2001 From: Dave Page Date: Mon, 6 Mar 2017 15:24:52 +0000 Subject: [PATCH] Fix regression tests with runtime auth. Fixes #2228 --- web/pgadmin/__init__.py | 3 ++- web/regression/runtests.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/web/pgadmin/__init__.py b/web/pgadmin/__init__.py index c5d312b72..fba26ce39 100644 --- a/web/pgadmin/__init__.py +++ b/web/pgadmin/__init__.py @@ -414,13 +414,14 @@ def create_app(app_name=config.APP_NAME): @app.before_request def before_request(): """Login the default user if running in desktop mode""" - if app.PGADMIN_RUNTIME == True: + if not config.SERVER_MODE and app.PGADMIN_KEY != '': if ( (not 'key' in request.args or request.args['key'] != app.PGADMIN_KEY) and request.cookies.get('PGADMIN_KEY') != app.PGADMIN_KEY ): abort(401) + if not config.SERVER_MODE: user = user_datastore.get_user(config.DESKTOP_USER) # Throw an error if we failed to find the desktop user, to give diff --git a/web/regression/runtests.py b/web/regression/runtests.py index 50c6716e0..db168a83b 100644 --- a/web/regression/runtests.py +++ b/web/regression/runtests.py @@ -91,6 +91,7 @@ config.CONSOLE_LOG_LEVEL = WARNING # Create the app app = create_app() app.config['WTF_CSRF_ENABLED'] = False +app.PGADMIN_KEY = '' test_client = app.test_client() driver = webdriver.Chrome() app_starter = AppStarter(driver, config)