Enhanced summary output for the test suite.

web/pgadmin/browser/server_groups/servers/tests/test_server_add.py

@@ -11,7 +11,6 @@ import json
 
 from pgadmin.utils.route import BaseTestGenerator
 from regression import test_utils as utils
-from . import utils as server_utils
 
 
 class ServersAddTestCase(BaseTestGenerator):
@@ -22,8 +21,7 @@ class ServersAddTestCase(BaseTestGenerator):
         ('Default Server Node url', dict(url='/browser/server/obj/'))
     ]
 
-    @classmethod
-    def setUpClass(cls):
+    def setUp(self):
         pass
 
     def runTest(self):
@@ -33,14 +31,9 @@ class ServersAddTestCase(BaseTestGenerator):
                                     content_type='html/json')
         self.assertEquals(response.status_code, 200)
         response_data = json.loads(response.data.decode('utf-8'))
-        server_id = response_data['node']['_id']
-        utils.write_node_info(int(server_id), "sid", self.server)
+        self.server_id = response_data['node']['_id']
+        utils.write_node_info(int(self.server_id), "sid", self.server)
 
-    @classmethod
-    def tearDownClass(cls):
-        """
-        This function delete the server from SQLite & clears the node_info_dict
-        """
-        server_id = server_utils.get_server_id()
-        utils.delete_server(server_id)
-        utils.clear_node_info_dict()
+    def tearDown(self):
+        """This function delete the server from SQLite """
+        utils.delete_server(self.server_id)

web/pgadmin/browser/server_groups/servers/tests/test_server_delete.py

@@ -6,12 +6,8 @@
 # This software is released under the PostgreSQL Licence
 #
 # ##################################################################
-
-import json
-
 from pgadmin.utils.route import BaseTestGenerator
 from regression import test_utils as utils
-from . import utils as server_utils
 
 
 class ServerDeleteTestCase(BaseTestGenerator):
@@ -22,29 +18,19 @@ class ServerDeleteTestCase(BaseTestGenerator):
         ('Default Server Node url', dict(url='/browser/server/obj/'))
     ]
 
-    @classmethod
-    def setUpClass(cls):
+    def setUp(self):
         """This function add the server to test the DELETE API"""
-        server_utils.add_server(cls.server)
+        self.server_id = utils.create_server(self.server)
 
     def runTest(self):
         """This function deletes the added server"""
-        all_id = utils.get_node_info_dict()
-        servers_info = all_id["sid"]
         url = self.url + str(utils.SERVER_GROUP) + "/"
-
-        if len(servers_info) == 0:
+        if not self.server_id:
             raise Exception("No server to delete!!!")
-
         # Call API to delete the servers
-        server_id = list(servers_info[0].keys())[0]
-        response = self.tester.delete(url + str(server_id))
+        response = self.tester.delete(url + str(self.server_id))
         self.assertEquals(response.status_code, 200)
-        response_data = json.loads(response.data.decode('utf-8'))
-        self.assertEquals(response_data['success'], 1)
 
-    @classmethod
-    def tearDownClass(cls):
-        """This function calls the clear_node_info_dict() function to clears
-        the node_info_dict"""
-        utils.clear_node_info_dict()
+    def tearDown(self):
+        """This function delete the server from SQLite """
+        utils.delete_server(self.server_id)

web/pgadmin/browser/server_groups/servers/tests/test_server_put.py

@@ -10,7 +10,6 @@
 import json
 from pgadmin.utils.route import BaseTestGenerator
 from regression import test_utils as utils
-from . import utils as server_utils
 
 
 class ServerUpdateTestCase(BaseTestGenerator):
@@ -21,37 +20,21 @@ class ServerUpdateTestCase(BaseTestGenerator):
         ('Default Server Node url', dict(url='/browser/server/obj/'))
     ]
 
-    @classmethod
-    def setUpClass(cls):
+    def setUp(self):
         """This function add the server to test the PUT API"""
-        server_utils.add_server(cls.server)
+        self.server_id = utils.create_server(self.server)
 
     def runTest(self):
         """This function update the server details"""
-        all_id = utils.get_node_info_dict()
-        servers_info = all_id["sid"]
-
-        if len(servers_info) == 0:
+        if not self.server_id:
             raise Exception("No server to update.")
-
-        server_id = list(servers_info[0].keys())[0]
-        data = {
-            "comment":
-                server_utils.config_data['server_update_data'][0][
-                    'comment'],
-            "id": server_id
-        }
+        data = {"comment": self.server['comment'], "id": self.server_id}
         put_response = self.tester.put(
             self.url + str(utils.SERVER_GROUP) + '/' +
-            str(server_id), data=json.dumps(data),
+            str(self.server_id), data=json.dumps(data),
             content_type='html/json')
         self.assertEquals(put_response.status_code, 200)
 
-    @classmethod
-    def tearDownClass(cls):
-        """
-        This function delete the server from SQLite & clears the node_info_dict
-        """
-        server_id = server_utils.get_server_id()
-        utils.delete_server(server_id)
-        utils.clear_node_info_dict()
+    def tearDown(self):
+        """This function delete the server from SQLite"""
+        utils.delete_server(self.server_id)

web/pgadmin/browser/server_groups/servers/tests/utils.py

@@ -19,17 +19,7 @@ from regression import test_utils as utils
 from regression.test_setup import config_data
 
 SERVER_URL = '/browser/server/obj/'
-SERVER_CONNECT_URL = 'browser/server/connect/'
-
-
-def get_server_id():
-    """This function returns the server id from node_info_dict"""
-
-    server_id = 0
-    if "sid" in node_info_dict:
-        if node_info_dict['sid']:
-            server_id = list(node_info_dict['sid'][0].keys())[0]
-    return server_id
+SERVER_CONNECT_URL = '/browser/server/connect/'
 
 
 def connect_server(self, server_id):
@@ -37,8 +27,8 @@ def connect_server(self, server_id):
     This function used to connect added server
     :param self: class object of server's test class
     :type self: class
-    :param server_id: flag for db add test case
-    :type server_id: bool
+    :param server_id: server id
+    :type server_id: str
     """
     response = self.tester.post(SERVER_CONNECT_URL + str(utils.SERVER_GROUP) +
                                 '/' + str(server_id),
@@ -47,24 +37,3 @@ def connect_server(self, server_id):
     assert response.status_code == 200
     response_data = json.loads(response.data.decode('utf-8'))
     return response_data
-
-
-def add_server(server):
-    try:
-        conn = sqlite3.connect(config.SQLITE_PATH)
-        cur = conn.cursor()
-        server_details = (
-            1, utils.SERVER_GROUP, server['name'], server['host'],
-            server['port'], server['db'], server['username'],
-            server['role'], server['sslmode'],
-            server['comment'])
-        cur.execute(
-            'INSERT INTO server (user_id, servergroup_id, name, host, '
-            'port, maintenance_db, username, role, ssl_mode,'
-            ' comment) VALUES (?,?,?,?,?,?,?,?,?,?)', server_details)
-        server_id = cur.lastrowid
-        # Add server info to node_info_dict
-        utils.write_node_info(int(server_id), "sid", server)
-        conn.commit()
-    except Exception as err:
-        raise Exception(err)