From 656e239e55d8a6963a1f85b5a19a56f367c99d0b Mon Sep 17 00:00:00 2001
From: Pradip Parkale <pradip.parkale@enterprisedb.com>
Date: Thu, 1 Oct 2020 12:58:54 +0530
Subject: [PATCH] Fixed API test cases introduce in the commit for #5867.

refs #5867
---
 .../servers/tests/test_all_server_get.py      | 23 +++++++++++++++----
 .../server_groups/servers/tests/utils.py      | 22 ++++++++++++++++++
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_all_server_get.py b/web/pgadmin/browser/server_groups/servers/tests/test_all_server_get.py
index cd35a7a05..a8de9056f 100644
--- a/web/pgadmin/browser/server_groups/servers/tests/test_all_server_get.py
+++ b/web/pgadmin/browser/server_groups/servers/tests/test_all_server_get.py
@@ -12,6 +12,7 @@ from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression.python_test_utils import test_utils as utils
 from . import utils as servers_utils
+import json
 
 
 class AllServersGetTestCase(BaseTestGenerator):
@@ -25,8 +26,22 @@ class AllServersGetTestCase(BaseTestGenerator):
 
     def setUp(self):
         """This function add the server to test the GET API"""
-        self.server['password'] = 'edb'
-        self.server_id = utils.create_server(self.server)
+
+        server_details = servers_utils.get_server_data(self.server)
+        server_details['password'] = self.server['db_password']
+        server_details['save_password'] = 1
+        server_details['connect_now'] = 1
+
+        url = "/browser/server/obj/{0}/".format(utils.SERVER_GROUP)
+
+        response = self.tester.post(
+            url,
+            data=json.dumps(server_details),
+            content_type='html/json'
+        )
+        response_data = json.loads(response.data.decode('utf-8'))
+        self.server_id = response_data['node']['_id']
+
         server_dict = {"server_id": self.server_id}
         utils.write_node_info("sid", server_dict)
 
@@ -53,7 +68,7 @@ class AllServersGetTestCase(BaseTestGenerator):
             elif hasattr(self, 'children'):
 
                 self.url = self.url + '{0}/{1}'.format(
-                    utils.SERVER_GROUP, server_id)
+                    utils.SERVER_GROUP, self.server_id)
             elif hasattr(self, 'server_list'):
                 if hasattr(self, 'servers'):
                     server_id = ''
@@ -64,7 +79,7 @@ class AllServersGetTestCase(BaseTestGenerator):
                     url = '/browser/server/connect/' + '{0}/{1}'.format(
                         utils.SERVER_GROUP,
                         self.server_id)
-                    self.server['password'] = 'edb'
+                    self.server['password'] = self.server['db_password']
 
                     self.connect_to_server(url)
                 self.url = self.url + '{0}/{1}?_={2}'.format(
diff --git a/web/pgadmin/browser/server_groups/servers/tests/utils.py b/web/pgadmin/browser/server_groups/servers/tests/utils.py
index 8680b29fb..56d475a90 100644
--- a/web/pgadmin/browser/server_groups/servers/tests/utils.py
+++ b/web/pgadmin/browser/server_groups/servers/tests/utils.py
@@ -50,3 +50,25 @@ def create_server_with_api(self, url):
         return server_id
     except Exception as exception:
         raise Exception("Error while creating server. %s" % exception)
+
+
+def get_server_data(server):
+    """
+    This function returns the server details
+    :param server:
+    :return: server data
+    """
+
+    server_data = \
+        {
+            "name": server['name'],
+            "comment": server['comment'],
+            "username": server['username'],
+            "host": server['host'],
+            "db_password": server['db_password'],
+            "port": server['port'],
+            "sslmode": server['sslmode'],
+            "db": server['db']
+        }
+
+    return server_data