From 98b7603ebd761b9c508d5ad09ae18c5349e960d1 Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Fri, 25 Dec 2020 18:32:01 +0530 Subject: [PATCH] Close query tool connection for API test cases. --- .../tools/sqleditor/tests/test_download_csv_query_tool.py | 5 +++++ web/pgadmin/tools/sqleditor/tests/test_editor_history.py | 5 +++++ web/pgadmin/tools/sqleditor/tests/test_encoding_charset.py | 5 +++++ web/pgadmin/tools/sqleditor/tests/test_explain_plan.py | 5 +++++ web/pgadmin/tools/sqleditor/tests/test_macros.py | 5 +++++ web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py | 5 +++++ .../tools/sqleditor/tests/test_transaction_status.py | 7 +++++++ .../utils/tests/test_is_query_resultset_updatable.py | 7 +++++++ .../tools/sqleditor/utils/tests/test_save_changed_data.py | 7 +++++++ 9 files changed, 51 insertions(+) diff --git a/web/pgadmin/tools/sqleditor/tests/test_download_csv_query_tool.py b/web/pgadmin/tools/sqleditor/tests/test_download_csv_query_tool.py index 61d369267..921e06607 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_download_csv_query_tool.py +++ b/web/pgadmin/tools/sqleditor/tests/test_download_csv_query_tool.py @@ -210,6 +210,11 @@ class TestDownloadCSV(BaseTestGenerator): # when TX id is invalid self.assertEqual(response.status_code, 500) + # Close query tool + url = '/datagrid/close/{0}'.format(self.trans_id) + response = self.tester.delete(url) + self.assertEqual(response.status_code, 200) + database_utils.disconnect_database(self, self._sid, self._did) def tearDown(self): diff --git a/web/pgadmin/tools/sqleditor/tests/test_editor_history.py b/web/pgadmin/tools/sqleditor/tests/test_editor_history.py index 6e09d43ad..e9095f27e 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_editor_history.py +++ b/web/pgadmin/tools/sqleditor/tests/test_editor_history.py @@ -100,5 +100,10 @@ class TestEditorHistory(BaseTestGenerator): self.expected_len) def tearDown(self): + # Close query tool + url = '/datagrid/close/{0}'.format(self.trans_id) + response = self.tester.delete(url) + self.assertEqual(response.status_code, 200) + # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/tools/sqleditor/tests/test_encoding_charset.py b/web/pgadmin/tools/sqleditor/tests/test_encoding_charset.py index f734ea1c0..be20cc1da 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_encoding_charset.py +++ b/web/pgadmin/tools/sqleditor/tests/test_encoding_charset.py @@ -276,6 +276,11 @@ class TestEncodingCharset(BaseTestGenerator): result = response_data['data']['result'][0][0] self.assertEqual(result, self.test_str) + # Close query tool + url = '/datagrid/close/{0}'.format(self.trans_id) + response = self.tester.delete(url) + self.assertEqual(response.status_code, 200) + database_utils.disconnect_database(self, self.encode_sid, self.encode_did) diff --git a/web/pgadmin/tools/sqleditor/tests/test_explain_plan.py b/web/pgadmin/tools/sqleditor/tests/test_explain_plan.py index 80ce48bff..918ac73a2 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_explain_plan.py +++ b/web/pgadmin/tools/sqleditor/tests/test_explain_plan.py @@ -67,5 +67,10 @@ class TestExplainPlan(BaseTestGenerator): self.assertEqual(len(response_data['data']['result']), 1) self.assertEqual(len(response_data['data']['result'][0]), 1) + # Close query tool + url = '/datagrid/close/{0}'.format(self.trans_id) + response = self.tester.delete(url) + self.assertEqual(response.status_code, 200) + # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/tools/sqleditor/tests/test_macros.py b/web/pgadmin/tools/sqleditor/tests/test_macros.py index 80d5c8bf4..d3b134339 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_macros.py +++ b/web/pgadmin/tools/sqleditor/tests/test_macros.py @@ -149,5 +149,10 @@ class TestMacros(BaseTestGenerator): self.assertEqual(response_data['sql'], m['sql']) def tearDown(self): + # Close query tool + url = '/datagrid/close/{0}'.format(self.trans_id) + response = self.tester.delete(url) + self.assertEqual(response.status_code, 200) + # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py b/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py index 4109773df..afa5a674c 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py +++ b/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py @@ -109,5 +109,10 @@ NOTICE: Hello, world! cnt += 1 + # Close query tool + url = '/datagrid/close/{0}'.format(self.trans_id) + response = self.tester.delete(url) + self.assertEqual(response.status_code, 200) + # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/tools/sqleditor/tests/test_transaction_status.py b/web/pgadmin/tools/sqleditor/tests/test_transaction_status.py index b12d94885..b16e60f8b 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_transaction_status.py +++ b/web/pgadmin/tools/sqleditor/tests/test_transaction_status.py @@ -239,6 +239,8 @@ class TestTransactionControl(BaseTestGenerator): self._check_transaction_status(TX_STATUS_IDLE) def tearDown(self): + # Close query tool + self._close_query_tool() # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) @@ -335,3 +337,8 @@ class TestTransactionControl(BaseTestGenerator): self.select_sql = "SELECT * FROM %s" % test_table_name utils.create_table_with_query(self.server, self.db_name, create_sql) + + def _close_query_tool(self): + url = '/datagrid/close/{0}'.format(self.trans_id) + response = self.tester.delete(url) + self.assertEqual(response.status_code, 200) diff --git a/web/pgadmin/tools/sqleditor/utils/tests/test_is_query_resultset_updatable.py b/web/pgadmin/tools/sqleditor/utils/tests/test_is_query_resultset_updatable.py index 279c8736f..5999f31d9 100644 --- a/web/pgadmin/tools/sqleditor/utils/tests/test_is_query_resultset_updatable.py +++ b/web/pgadmin/tools/sqleditor/utils/tests/test_is_query_resultset_updatable.py @@ -146,6 +146,8 @@ class TestQueryUpdatableResultset(BaseTestGenerator): self._check_editable_columns(response_data) def tearDown(self): + # Close query tool + self._close_query_tool() # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) @@ -232,6 +234,11 @@ class TestQueryUpdatableResultset(BaseTestGenerator): utils.create_table_with_query(self.server, self.db_name, create_sql) + def _close_query_tool(self): + url = '/datagrid/close/{0}'.format(self.trans_id) + response = self.tester.delete(url) + self.assertEqual(response.status_code, 200) + class TestTemporaryTable(TestQueryUpdatableResultset): """ This class will test the query result-set for temporary tables """ diff --git a/web/pgadmin/tools/sqleditor/utils/tests/test_save_changed_data.py b/web/pgadmin/tools/sqleditor/utils/tests/test_save_changed_data.py index 4626800fe..434b641df 100644 --- a/web/pgadmin/tools/sqleditor/utils/tests/test_save_changed_data.py +++ b/web/pgadmin/tools/sqleditor/utils/tests/test_save_changed_data.py @@ -865,6 +865,8 @@ class TestSaveChangedData(BaseTestGenerator): self._check_saved_data() def tearDown(self): + # Close query tool + self._close_query_tool() # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) @@ -951,3 +953,8 @@ class TestSaveChangedData(BaseTestGenerator): self.select_sql = 'SELECT * FROM %s;' % self.test_table_name utils.create_table_with_query(self.server, self.db_name, create_sql) + + def _close_query_tool(self): + url = '/datagrid/close/{0}'.format(self.trans_id) + response = self.tester.delete(url) + self.assertEqual(response.status_code, 200)