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

Fixed BatchProcessTest cases failing on Jenkins.

Browse Source
This commit is contained in:
Khushboo Vashi 2020-11-19 18:09:35 +05:30 committed by Akshay Joshi
parent 3e2a1c4eca
commit 29c3c0cf7f
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,8 +142,10 @@ class BatchProcessTest(BaseTestGenerator):
@patch('pgadmin.misc.bgprocess.processes.Process') @patch('pgadmin.misc.bgprocess.processes.Process')
@patch('pgadmin.misc.bgprocess.processes.BatchProcess.' @patch('pgadmin.misc.bgprocess.processes.BatchProcess.'
'update_process_info') 'update_process_info')
def _check_list(self, p, maintenance_obj, update_process_info_mock, @patch('pgadmin.misc.bgprocess.processes.BatchProcess.'
process_mock): '_operate_orphan_process')
def _check_list(self, p, maintenance_obj, _operate_orphan_process_mock,
update_process_info_mock, process_mock):
class TestMockProcess(): class TestMockProcess():
def __init__(self, desc, args, cmd): def __init__(self, desc, args, cmd):
self.pid = 1 self.pid = 1
@ -163,6 +165,7 @@ class BatchProcessTest(BaseTestGenerator):
] ]
update_process_info_mock.return_value = [True, True] update_process_info_mock.return_value = [True, True]
_operate_orphan_process_mock.return_value = False
ret_value = p.list() ret_value = p.list()
self.assertEqual(1, len(ret_value)) self.assertEqual(1, len(ret_value))

7
web/pgadmin/tools/restore/tests/test_batch_process.py
View File

@ -142,8 +142,10 @@ class BatchProcessTest(BaseTestGenerator):
@patch('pgadmin.misc.bgprocess.processes.Process') @patch('pgadmin.misc.bgprocess.processes.Process')
@patch('pgadmin.misc.bgprocess.processes.BatchProcess.' @patch('pgadmin.misc.bgprocess.processes.BatchProcess.'
'update_process_info') 'update_process_info')
def _check_list(self, p, restore_obj, update_process_info_mock, @patch('pgadmin.misc.bgprocess.processes.BatchProcess.'
process_mock): '_operate_orphan_process')
def _check_list(self, p, restore_obj, _operate_orphan_process_mock,
update_process_info_mock, process_mock):
class TestMockProcess(): class TestMockProcess():
def __init__(self, desc, args, cmd): def __init__(self, desc, args, cmd):
self.pid = 1 self.pid = 1
@ -163,6 +165,7 @@ class BatchProcessTest(BaseTestGenerator):
] ]
update_process_info_mock.return_value = [True, True] update_process_info_mock.return_value = [True, True]
_operate_orphan_process_mock.return_value = False
ret_value = p.list() ret_value = p.list()
self.assertEqual(1, len(ret_value)) self.assertEqual(1, len(ret_value))