Major update to the test suite:

1. Code changes (due to drop objects functionality).
2. Quoting for database names in drop databases.
3. Code changes for import errors for pickle_path and advanced_config variables.

web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_add.py

@@ -7,14 +7,11 @@
 #
 # ##################################################################
 from __future__ import print_function
-
-import os
-import sys
 import json
 
 from pgadmin.utils.route import BaseTestGenerator
 from regression import test_utils as utils
-from regression import test_server_dict
+from regression import parent_node_dict
 from pgadmin.browser.server_groups.servers.tests import utils as server_utils
 from . import utils as tablespace_utils
 
@@ -30,14 +27,14 @@ class TableSpaceAddTestCase(BaseTestGenerator):
         self.tablespace_name = ''
         if not self.server['tablespace_path']\
                 or self.server['tablespace_path'] is None:
-            message = "Skipped tablespace add test case. Tablespace path" \
+            message = "Tablespace add test case. Tablespace path" \
                       " not configured for server: %s" % self.server['name']
             # Skip the test case if tablespace_path not found.
             self.skipTest(message)
 
     def runTest(self):
         """This function test the add tablespace API"""
-        server_id = test_server_dict["server"][0]["server_id"]
+        server_id = parent_node_dict["server"][-1]["server_id"]
         server_response = server_utils.connect_server(self, server_id)
         if not server_response['data']['connected']:
             raise Exception("Unable to connect server to get tablespace.")
@@ -58,7 +55,7 @@ class TableSpaceAddTestCase(BaseTestGenerator):
         tablespace_dict = {"tablespace_id": tablespace_id,
                            "tablespace_name": self.tablespace_name,
                            "server_id": server_id}
-        utils.write_node_info(tablespace_id, "tsid", tablespace_dict)
+        utils.write_node_info("tsid", tablespace_dict)
 
     def tearDown(self):
         """

web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_delete.py

@@ -12,13 +12,12 @@ import json
 
 from pgadmin.utils.route import BaseTestGenerator
 from regression import test_utils as utils
-from regression import test_server_dict
+from regression import parent_node_dict
 from . import utils as tablespace_utils
 
 
 class TableSpaceDeleteTestCase(BaseTestGenerator):
     """This class has delete table space scenario"""
-
     scenarios = [
         # Fetching default URL for tablespace node.
         ('Check Tablespace Node', dict(url='/browser/tablespace/obj/'))
@@ -27,24 +26,28 @@ class TableSpaceDeleteTestCase(BaseTestGenerator):
     def setUp(self):
         if not self.server['tablespace_path']\
                 or self.server['tablespace_path'] is None:
-            message = "Skipped tablespace delete test case. Tablespace path" \
+            message = "Tablespace delete test case. Tablespace path" \
                       " not configured for server: %s" % self.server['name']
             # Skip the test case if tablespace_path not found.
             self.skipTest(message)
         self.tablespace_name = "tablespace_delete_%s" % str(uuid.uuid4())[1:6]
+        self.server_id = parent_node_dict["server"][-1]["server_id"]
         self.tablespace_id = tablespace_utils.create_tablespace(
             self.server, self.tablespace_name)
+        tablespace_dict = {"tablespace_id": self.tablespace_id,
+                           "tablespace_name": self.tablespace_name,
+                           "server_id": self.server_id}
+        utils.write_node_info("tsid", tablespace_dict)
 
     def runTest(self):
         """This function tests the delete table space api"""
-        server_id = test_server_dict["server"][0]["server_id"]
         tablespace_count = tablespace_utils.verify_table_space(
             self.server, self.tablespace_name)
         if tablespace_count == 0:
             raise Exception("No tablespace(s) to delete!!!")
 
         response = self.tester.delete(self.url + str(utils.SERVER_GROUP)
-                                      + '/' + str(server_id) + '/'
+                                      + '/' + str(self.server_id) + '/'
                                       + str(self.tablespace_id),
                                       follow_redirects=True)
         self.assertEquals(response.status_code, 200)

web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_get.py

@@ -10,7 +10,7 @@ import uuid
 
 from pgadmin.utils.route import BaseTestGenerator
 from regression import test_utils as utils
-from regression import test_server_dict
+from regression import parent_node_dict
 from pgadmin.browser.server_groups.servers.tests import utils as server_utils
 from . import utils as tablespace_utils
 
@@ -26,18 +26,22 @@ class TablespaceGetTestCase(BaseTestGenerator):
     def setUp(self):
         if not self.server['tablespace_path']\
                 or self.server['tablespace_path'] is None:
-            message = "Skipped tablespace get test case. Tablespace path" \
+            message = "Tablespace get test case. Tablespace path" \
                       " not configured for server: %s" % self.server['name']
             # Skip the test case if tablespace_path not found.
             self.skipTest(message)
         self.tablespace_name = "tablespace_delete_%s" % str(uuid.uuid4())[1:6]
         self.tablespace_id = tablespace_utils.create_tablespace(
             self.server, self.tablespace_name)
+        self.server_id = parent_node_dict["server"][-1]["server_id"]
+        tablespace_dict = {"tablespace_id": self.tablespace_id,
+                           "tablespace_name": self.tablespace_name,
+                           "server_id": self.server_id}
+        utils.write_node_info("tsid", tablespace_dict)
 
     def runTest(self):
         """This function test the get table space scenario"""
-        server_id = test_server_dict["server"][0]["server_id"]
-        server_response = server_utils.connect_server(self, server_id)
+        server_response = server_utils.connect_server(self, self.server_id)
         if not server_response['data']['connected']:
             raise Exception("Unable to connect server to get tablespace.")
 
@@ -47,7 +51,7 @@ class TablespaceGetTestCase(BaseTestGenerator):
             raise Exception("No tablespace(s) to update!!!")
         response = self.tester.get(
             self.url + str(utils.SERVER_GROUP) + '/' +
-            str(server_id) + '/' + str(self.tablespace_id),
+            str(self.server_id) + '/' + str(self.tablespace_id),
             follow_redirects=True)
         self.assertEquals(response.status_code, 200)
 

web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_put.py

@@ -12,7 +12,7 @@ import uuid
 
 from pgadmin.utils.route import BaseTestGenerator
 from regression import test_utils as utils
-from regression import test_server_dict
+from regression import parent_node_dict
 from . import utils as tablespace_utils
 
 
@@ -27,17 +27,21 @@ class TableSpaceUpdateTestCase(BaseTestGenerator):
     def setUp(self):
         if not self.server['tablespace_path']\
                 or self.server['tablespace_path'] is None:
-            message = "Skipped tablespace delete test case. Tablespace path" \
+            message = "Tablespace delete test case. Tablespace path" \
                       " not configured for server: %s" % self.server['name']
             # Skip the test case if tablespace_path not found.
             self.skipTest(message)
         self.tablespace_name = "tablespace_delete_%s" % str(uuid.uuid4())[1:6]
         self.tablespace_id = tablespace_utils.create_tablespace(
             self.server, self.tablespace_name)
+        self.server_id = parent_node_dict["server"][-1]["server_id"]
+        tablespace_dict = {"tablespace_id": self.tablespace_id,
+                           "tablespace_name": self.tablespace_name,
+                           "server_id": self.server_id}
+        utils.write_node_info("tsid", tablespace_dict)
 
     def runTest(self):
         """This function tests the update tablespace data scenario"""
-        server_id = test_server_dict["server"][0]["server_id"]
         tablespace_count = tablespace_utils.verify_table_space(
             self.server, self.tablespace_name)
         if tablespace_count == 0:
@@ -48,7 +52,7 @@ class TableSpaceUpdateTestCase(BaseTestGenerator):
             "table_space_id": self.tablespace_id
             }
         put_response = self.tester.put(
-            self.url + str(utils.SERVER_GROUP) + '/' + str(server_id) + '/'
+            self.url + str(utils.SERVER_GROUP) + '/' + str(self.server_id) + '/'
             + str(self.tablespace_id), data=json.dumps(data),
             follow_redirects=True)
         self.assertEquals(put_response.status_code, 200)