Fixed test case failures.

This commit is contained in:
Aditya Toshniwal 2021-08-26 15:01:26 +05:30 committed by Akshay Joshi
parent 51d73b1672
commit 56e2af9efc
5 changed files with 21 additions and 14 deletions

View File

@ -143,9 +143,13 @@ class PGUtilitiesMaintenanceFeatureTest(BaseFeatureTest):
NavMenuLocators.
process_watcher_detailed_command_canvas_css).text
vacuum_details = \
"VACUUM (VERBOSE) on database '{0}' of server " \
"{1} ({2}:{3})".format(self.database_name, self.server['name'],
self.server['host'], self.server['port'])
if self.test_level == 'database':
self.assertEqual(command, "VACUUM (VERBOSE)\nRunning Query:"
"\nVACUUM VERBOSE;")
self.assertEqual(
command, vacuum_details + "\nRunning Query:\nVACUUM VERBOSE;")
elif self.is_xss_check and self.test_level == 'table':
# Check for XSS in the dialog
source_code = self.page.find_by_css_selector(
@ -158,10 +162,9 @@ class PGUtilitiesMaintenanceFeatureTest(BaseFeatureTest):
'Maintenance detailed window'
)
else:
self.assertEqual(command, "VACUUM "
"(VERBOSE)\nRunning Query:"
"\nVACUUM VERBOSE"
" public." + self.table_name + ";")
self.assertEqual(
command, vacuum_details + "\nRunning Query:\nVACUUM VERBOSE;"
" public." + self.table_name + ";")
test_gui_helper.close_process_watcher(self)

View File

@ -736,10 +736,11 @@ class BackupCreateJobTest(BaseTestGenerator):
filename_mock.return_value = self.params['file']
batch_process_mock.set_env_variables = MagicMock(
batch_process_mock.return_value.id = 140391
batch_process_mock.return_value.set_env_variables = MagicMock(
return_value=True
)
batch_process_mock.start = MagicMock(
batch_process_mock.return_value.start = MagicMock(
return_value=True
)

View File

@ -307,10 +307,11 @@ class IECreateJobTest(BaseTestGenerator):
filename_mock.return_value = self.params['filename']
batch_process_mock.set_env_variables = MagicMock(
batch_process_mock.return_value.id = 140391
batch_process_mock.return_value.set_env_variables = MagicMock(
return_value=True
)
batch_process_mock.start = MagicMock(
batch_process_mock.return_value.start = MagicMock(
return_value=True
)

View File

@ -170,10 +170,11 @@ class MaintenanceCreateJobTest(BaseTestGenerator):
mock_result = server_mock.query.filter_by.return_value
mock_result.first.return_value = mock_obj
batch_process_mock.set_env_variables = MagicMock(
batch_process_mock.return_value.id = 140391
batch_process_mock.return_value.set_env_variables = MagicMock(
return_value=True
)
batch_process_mock.start = MagicMock(
batch_process_mock.return_value.start = MagicMock(
return_value=True
)
export_password_env_mock.return_value = True

View File

@ -340,10 +340,11 @@ class RestoreCreateJobTest(BaseTestGenerator):
filename_mock.return_value = self.params['file']
batch_process_mock.set_env_variables = MagicMock(
batch_process_mock.return_value.id = 140391
batch_process_mock.return_value.set_env_variables = MagicMock(
return_value=True
)
batch_process_mock.start = MagicMock(
batch_process_mock.return_value.start = MagicMock(
return_value=True
)