Try to fix feature test failures happening due to error occurring while deleting test databases.

* Try to fix feature test failures happening due to error occurring while deleting test databases.

* Updated ON_DEMAND_ROW_COUNT to ON_DEMAND_RECORD_COUNT missed in #3275.

docs/en_US/release_notes_7_1.rst

@@ -20,6 +20,7 @@ Bundled PostgreSQL Utilities
 New features
 ************
 
+  | `Issue #3275 <https://github.com/pgadmin-org/pgadmin4/issues/3275>`_ -  Allow on demand record count setting to be changed per user using preferences.
 
 Housekeeping
 ************
@@ -28,7 +29,6 @@ Housekeeping
 Bug fixes
 *********
 
-  | `Issue #3275 <https://github.com/pgadmin-org/pgadmin4/issues/3275>`_ -  Allow on demand record count setting to be changed per user using preferences.
   | `Issue #5777 <https://github.com/pgadmin-org/pgadmin4/issues/5777>`_ -  Fixed an issue where the browser tree state is not remembered when reopening pgAdmin.
   | `Issue #5820 <https://github.com/pgadmin-org/pgadmin4/issues/5820>`_ -  Fixed an issue where collation was set to none if we remove it while creating partitioned table.
   | `Issue #6075 <https://github.com/pgadmin-org/pgadmin4/issues/6075>`_ -  Ensure that the save button is enabled when registering a new server fails due to an API error.

web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py

@@ -301,7 +301,7 @@ def register_query_tool_preferences(self):
         help_str=gettext('Specify the number of records to fetch in one batch '
                          'in query tool when query result set is large. '
                          'Changing this value will override '
-                         'ON_DEMAND_ROW_COUNT setting from config file.')
+                         'ON_DEMAND_RECORD_COUNT setting from config file.')
     )
 
     self.sql_font_size = self.preference.register(

web/regression/feature_tests/query_tool_auto_complete_tests.py

@@ -157,6 +157,7 @@ class QueryToolAutoCompleteFeatureTest(BaseFeatureTest):
         self.page.clear_query_tool()
 
     def after(self):
+        self.page.close_query_tool(False)
         self.page.remove_server(self.server)
         test_utils.delete_table(self.server, self.test_db,
                                 self.first_table_name)

web/regression/feature_tests/query_tool_tests.py

@@ -96,6 +96,7 @@ class QueryToolFeatureTest(BaseFeatureTest):
         self.page.clear_query_tool()
 
     def after(self):
+        self.page.close_query_tool(False)
         self.page.remove_server(self.server)
 
     def _reset_options(self):

web/regression/feature_tests/test_copy_sql_to_query_tool.py

@@ -42,6 +42,7 @@ class CopySQLFeatureTest(BaseFeatureTest):
         self.assertEqual(query_tool_result, sql_query)
 
     def after(self):
+        self.page.close_query_tool(True)
         self.page.remove_server(self.server)
         test_utils.delete_table(
             self.server, self.test_db, self.test_table_name)

web/regression/feature_tests/xss_checks_panels_and_query_tool_test.py

@@ -69,22 +69,6 @@ class CheckForXssFeatureTest(BaseFeatureTest):
         self._check_xss_in_browser_tree()
         self._check_xss_in_sql_tab()
         self._check_xss_in_dependents_tab()
-        # sometime the tab for dependent does not show info, so refreshing
-        # the page and then again collapsing until the table node
-        # retry = 2
-        # while retry > 0:
-        #     try:
-        #         self.page.refresh_page()
-        #         self.page.wait_for_spinner_to_disappear()
-        #         self._tables_node_expandable()
-        #         self._check_xss_in_dependents_tab()
-        #         retry = 0
-        #     except WebDriverException as e:
-        #         print("Exception in dependent check {0}".format(retry),
-        #               file=sys.stderr)
-        #         if retry == 1:
-        #             raise e
-        #         retry -= 1
 
         # Query tool
         self.page.open_query_tool()