From 507d8b3fe41fcb7d402822f3b02c0b2cbc85f7b7 Mon Sep 17 00:00:00 2001 From: Dave Page Date: Fri, 25 Aug 2017 11:56:10 +0100 Subject: [PATCH] Regression tests aren't run under the runtime, so no need to check for builtins.SERVER_MODE's existence. --- web/regression/runtests.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/web/regression/runtests.py b/web/regression/runtests.py index 1a44a47ab..b2f7d9b6d 100644 --- a/web/regression/runtests.py +++ b/web/regression/runtests.py @@ -32,6 +32,9 @@ if sys.version_info[0] >= 3: else: import __builtin__ as builtins +# Ensure the global server mode is set. +builtins.SERVER_MODE = None + logger = logging.getLogger(__name__) file_name = os.path.basename(__file__) @@ -46,12 +49,6 @@ if sys.path[0] != root: sys.path.insert(0, root) os.chdir(root) -# Grab the SERVER_MODE if it's been set by the runtime -if 'SERVER_MODE' in globals(): - builtins.SERVER_MODE = globals()['SERVER_MODE'] -else: - builtins.SERVER_MODE = None - from pgadmin import create_app import config from regression import test_setup