From 056ed21148b631356ab0c658b3ee9c9af67db89d Mon Sep 17 00:00:00 2001
From: Dave Page <dpage@pgadmin.org>
Date: Sat, 15 Oct 2016 08:44:40 -0700
Subject: [PATCH] Allow test servers to be enabled or disabled easily in the
 config

---
 web/regression/test_config.json.in |  3 ++-
 web/regression/test_utils.py       | 23 ++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/web/regression/test_config.json.in b/web/regression/test_config.json.in
index 1328b6be6..a373dee30 100644
--- a/web/regression/test_config.json.in
+++ b/web/regression/test_config.json.in
@@ -20,7 +20,8 @@
       "db_port": 5432,
       "maintenance_db": "postgres",
       "sslmode": "prefer",
-      "tablespace_path": ""
+      "tablespace_path": "",
+      "enabled": true
     }
   ],
   "server_update_data": [
diff --git a/web/regression/test_utils.py b/web/regression/test_utils.py
index 36f51b1f8..00b88ad6a 100644
--- a/web/regression/test_utils.py
+++ b/web/regression/test_utils.py
@@ -69,17 +69,18 @@ def get_config_data():
     """This function reads the server data from config_data"""
     server_data = []
     for srv in test_setup.config_data['server_credentials']:
-        data = {"name": srv['name'],
-                "comment": srv['comment'],
-                "host": srv['host'],
-                "port": srv['db_port'],
-                "db": srv['maintenance_db'],
-                "username": srv['db_username'],
-                "db_password": srv['db_password'],
-                "role": "",
-                "sslmode": srv['sslmode'],
-                "tablespace_path": srv.get('tablespace_path', None)}
-        server_data.append(data)
+        if not hasattr(srv, 'enabled') or srv['enabled'] == True:
+            data = {"name": srv['name'],
+                    "comment": srv['comment'],
+                    "host": srv['host'],
+                    "port": srv['db_port'],
+                    "db": srv['maintenance_db'],
+                    "username": srv['db_username'],
+                    "db_password": srv['db_password'],
+                    "role": "",
+                    "sslmode": srv['sslmode'],
+                    "tablespace_path": srv.get('tablespace_path', None)}
+            server_data.append(data)
     return server_data