pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed failed test cases.

pull/57/head
Aditya Toshniwal 2021-08-25 11:10:45 +05:30 committed by Akshay Joshi
parent 737bc6a965
commit c6f9d447f7
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/tools/erd/static/js/erd_tool/dialogs/OneToManyDialog.js
View File

@ -60,7 +60,7 @@ export default class OneToManyDialog {
},{ },{
id: 'referenced_table_uid', label: gettext('Referenced Table'), id: 'referenced_table_uid', label: gettext('Referenced Table'),
type: 'select2', disabled: false, type: 'select2', disabled: false,
editable: true, options: (view)=>{ editable: true, options: ()=>{
let retOpts = []; let retOpts = [];
_.forEach(tableNodesDict, (node, uid)=>{ _.forEach(tableNodesDict, (node, uid)=>{
let [schema, name] = node.getSchemaTableName(); let [schema, name] = node.getSchemaTableName();

8
web/pgadmin/tools/maintenance/tests/test_batch_process_maintenance.py
View File

@ -17,6 +17,7 @@ from unittest.mock import patch, MagicMock
class BatchProcessTest(BaseTestGenerator): class BatchProcessTest(BaseTestGenerator):
"""Test the BatchProcess class""" """Test the BatchProcess class"""
SERVER_NAME = "server (host:port)"
scenarios = [ scenarios = [
('When maintained server', ('When maintained server',
dict( dict(
@ -46,17 +47,20 @@ class BatchProcessTest(BaseTestGenerator):
}, },
cmd="VACUUM VERBOSE;\n" cmd="VACUUM VERBOSE;\n"
), ),
expected_msg="Maintenance (Vacuum)", expected_msg="VACUUM (VERBOSE) on database "
"'postgres' of server " + SERVER_NAME,
expected_details_cmd='VACUUM VERBOSE;' expected_details_cmd='VACUUM VERBOSE;'
)) ))
] ]
@patch('pgadmin.tools.maintenance.Message.get_server_name')
@patch('pgadmin.misc.bgprocess.processes.Popen') @patch('pgadmin.misc.bgprocess.processes.Popen')
@patch('pgadmin.misc.bgprocess.processes.db') @patch('pgadmin.misc.bgprocess.processes.db')
@patch('pgadmin.tools.maintenance.Server') @patch('pgadmin.tools.maintenance.Server')
@patch('pgadmin.misc.bgprocess.processes.current_user') @patch('pgadmin.misc.bgprocess.processes.current_user')
def runTest(self, current_user_mock, server_mock, db_mock, def runTest(self, current_user_mock, server_mock, db_mock,
popen_mock): popen_mock, get_server_name_mock):
get_server_name_mock.return_value = self.SERVER_NAME
with self.app.app_context(): with self.app.app_context():
current_user_mock.id = 1 current_user_mock.id = 1
current_app.PGADMIN_RUNTIME = False current_app.PGADMIN_RUNTIME = False

22
web/pgadmin/tools/maintenance/tests/test_maintenance_message.py
View File

@ -9,10 +9,13 @@
from pgadmin.tools.maintenance import Message from pgadmin.tools.maintenance import Message
from pgadmin.utils.route import BaseTestGenerator from pgadmin.utils.route import BaseTestGenerator
from unittest.mock import patch
class MaintenanceMessageTest(BaseTestGenerator): class MaintenanceMessageTest(BaseTestGenerator):
"""Test the Maintenance Message class""" """Test the Maintenance Message class"""
SERVER_NAME = "server (host:port)"
scenarios = [ scenarios = [
('When maintained the server', ('When maintained the server',
dict( dict(
@ -28,7 +31,8 @@ class MaintenanceMessageTest(BaseTestGenerator):
}, },
cmd="VACUUM VERBOSE;\n" cmd="VACUUM VERBOSE;\n"
), ),
expected_msg="Maintenance (Vacuum)", expected_msg="VACUUM (VERBOSE) on database "
"'postgres' of server " + SERVER_NAME,
expected_details_cmd='VACUUM VERBOSE;' expected_details_cmd='VACUUM VERBOSE;'
)), )),
@ -46,7 +50,8 @@ class MaintenanceMessageTest(BaseTestGenerator):
}, },
cmd="VACUUM FULL VERBOSE;\n" cmd="VACUUM FULL VERBOSE;\n"
), ),
expected_msg="Maintenance (Vacuum)", expected_msg="VACUUM (FULL, VERBOSE) on database "
"'postgres' of server " + SERVER_NAME,
expected_details_cmd='VACUUM FULL VERBOSE;' expected_details_cmd='VACUUM FULL VERBOSE;'
)), )),
@ -64,7 +69,8 @@ class MaintenanceMessageTest(BaseTestGenerator):
}, },
cmd="ANALYZE VERBOSE;\n" cmd="ANALYZE VERBOSE;\n"
), ),
expected_msg="Maintenance (Analyze)", expected_msg="ANALYZE(VERBOSE) on database "
"'postgres' of server " + SERVER_NAME,
expected_details_cmd='ANALYZE VERBOSE;' expected_details_cmd='ANALYZE VERBOSE;'
)), )),
@ -82,7 +88,8 @@ class MaintenanceMessageTest(BaseTestGenerator):
}, },
cmd="REINDEX;\n" cmd="REINDEX;\n"
), ),
expected_msg="Maintenance (Reindex)", expected_msg="REINDEX on database "
"'postgres' of server " + SERVER_NAME,
expected_details_cmd='REINDEX;' expected_details_cmd='REINDEX;'
)), )),
@ -100,13 +107,16 @@ class MaintenanceMessageTest(BaseTestGenerator):
}, },
cmd="CLUSTER VERBOSE;\n" cmd="CLUSTER VERBOSE;\n"
), ),
expected_msg="Maintenance (Cluster)", expected_msg="CLUSTER on database "
"'postgres' of server " + SERVER_NAME,
expected_details_cmd='CLUSTER VERBOSE;' expected_details_cmd='CLUSTER VERBOSE;'
)), )),
] ]
def runTest(self): @patch('pgadmin.tools.maintenance.Message.get_server_name')
def runTest(self, get_server_name_mock):
get_server_name_mock.return_value = self.SERVER_NAME
maintenance_obj = Message( maintenance_obj = Message(
self.class_params['sid'], self.class_params['sid'],
self.class_params['data'], self.class_params['data'],