IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use test methods with @patch rather than directly.

Browse Source
This commit is contained in:
Joao Pedro De Almeida Pereira 2018-03-09 13:25:35 +00:00 committed by Dave Page
parent 0283f68d7f
commit 83477224cb
1 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
web/pgadmin/tools/sqleditor/utils/tests/test_start_running_query.py
View File

@ -8,8 +8,8 @@
########################################################################## ##########################################################################
import sys import sys
from flask import Response
import simplejson as json import simplejson as json
from flask import Response
from pgadmin.tools.sqleditor.utils.start_running_query import StartRunningQuery from pgadmin.tools.sqleditor.utils.start_running_query import StartRunningQuery
from pgadmin.utils.exception import ConnectionLost from pgadmin.utils.exception import ConnectionLost
@ -385,8 +385,14 @@ class StartRunningQueryTest(BaseTestGenerator):
'.internal_server_error') '.internal_server_error')
@patch('pgadmin.tools.sqleditor.utils.start_running_query' @patch('pgadmin.tools.sqleditor.utils.start_running_query'
'.update_session_grid_transaction') '.update_session_grid_transaction')
def runTest(self, update_session_grid_transaction_mock, @patch('pgadmin.tools.sqleditor.utils.start_running_query'
internal_server_error_mock, get_driver_mock, pickle_mock, '.StartRunningQuery.is_begin_required_for_sql_query')
@patch('pgadmin.tools.sqleditor.utils.start_running_query'
'.StartRunningQuery.is_rollback_statement_required')
def runTest(self, is_rollback_statement_required_stub,
is_begin_required_for_sql_query_stub,
update_session_grid_transaction_stub,
internal_server_error_mock, get_driver_stub, pickle_stub,
make_json_response_mock, make_json_response_mock,
apply_explain_plan_wrapper_if_needed_mock): apply_explain_plan_wrapper_if_needed_mock):
"""Check correct function is called to handle to run query.""" """Check correct function is called to handle to run query."""
@ -398,41 +404,27 @@ class StartRunningQueryTest(BaseTestGenerator):
make_json_response_mock.return_value = expected_response make_json_response_mock.return_value = expected_response
if self.expect_internal_server_error_called_with is not None: if self.expect_internal_server_error_called_with is not None:
internal_server_error_mock.return_value = expected_response internal_server_error_mock.return_value = expected_response
pickle_mock.loads.return_value = self.pickle_load_return pickle_stub.loads.return_value = self.pickle_load_return
blueprint_mock = MagicMock( blueprint_mock = MagicMock(
info_notifier_timeout=MagicMock(get=lambda: 5)) info_notifier_timeout=MagicMock(get=lambda: 5))
# Save value for the later use
self.is_begin_required_for_sql_query = \
StartRunningQuery.is_begin_required_for_sql_query
self.is_rollback_statement_required = \
StartRunningQuery.is_rollback_statement_required
if self.is_begin_required: if self.is_begin_required:
StartRunningQuery.is_begin_required_for_sql_query = MagicMock( is_begin_required_for_sql_query_stub.return_value = True
return_value=True
)
else: else:
StartRunningQuery.is_begin_required_for_sql_query = MagicMock( is_begin_required_for_sql_query_stub.return_value = False
return_value=False
)
if self.is_rollback_required: if self.is_rollback_required:
StartRunningQuery.is_rollback_statement_required = MagicMock( is_rollback_statement_required_stub.return_value = True
return_value=True
)
else: else:
StartRunningQuery.is_rollback_statement_required = MagicMock( is_rollback_statement_required_stub.return_value = False
return_value=False
)
apply_explain_plan_wrapper_if_needed_mock.return_value = \ apply_explain_plan_wrapper_if_needed_mock.return_value = \
self.apply_explain_plan_wrapper_if_needed_return_value self.apply_explain_plan_wrapper_if_needed_return_value
manager = self.__create_manager() manager = self.__create_manager()
if self.get_driver_exception: if self.get_driver_exception:
get_driver_mock.side_effect = get_driver_exception get_driver_stub.side_effect = get_driver_exception
else: else:
get_driver_mock.return_value = MagicMock( get_driver_stub.return_value = MagicMock(
connection_manager=lambda session_id: manager) connection_manager=lambda session_id: manager)
try: try:
@ -525,10 +517,3 @@ class StartRunningQueryTest(BaseTestGenerator):
self.connection.execute_void.assert_called_with('ROLLBACK;') self.connection.execute_void.assert_called_with('ROLLBACK;')
elif not self.is_begin_required: elif not self.is_begin_required:
self.connection.execute_void.assert_not_called() self.connection.execute_void.assert_not_called()
def tearDown(self):
# Reset methods to the original state
StartRunningQuery.is_rollback_statement_required = \
staticmethod(self.is_rollback_statement_required)
StartRunningQuery.is_rollback_statement_required = \
staticmethod(self.is_rollback_statement_required)