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

1) Fixed process watcher status message when user has stopped the process.

Browse Source 
2) Saved the process state in sqlite database.
This commit is contained in:
Akshay Joshi
2018-10-25 17:03:34 +05:30
parent 091aa62084
commit 6ddab02769
7 changed files with 158 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
web/pgadmin/tools/backup/tests/test_batch_process.py
View File

@@ -15,9 +15,9 @@ from pgadmin.utils.route import BaseTestGenerator
from pickle import dumps, loads
if sys.version_info < (3, 3):
from mock import patch
from mock import patch, MagicMock
else:
from unittest.mock import patch
from unittest.mock import patch, MagicMock
class BatchProcessTest(BaseTestGenerator):
@@ -141,6 +141,7 @@ class BatchProcessTest(BaseTestGenerator):
))
db_mock.session.add.side_effect = db_session_add_mock
db_mock.session.commit = MagicMock(return_value=True)
get_server_details_mock.return_value = \
self.class_params['name'],\
@@ -165,12 +166,29 @@ class BatchProcessTest(BaseTestGenerator):
self.assertTrue(db_mock.session.add.called)
# Check start method
self._check_start(popen_mock, p)
self._check_start(popen_mock, p, backup_obj)
# Check list method
self._check_list(p, backup_obj)
def _check_start(self, popen_mock, p):
@patch('pgadmin.misc.bgprocess.processes.Process')
def _check_start(self, popen_mock, p, backup_obj, process_mock):
class TestMockProcess():
def __init__(self, desc, args, cmd):
self.pid = 1
self.exit_code = 1
self.start_time = '2018-04-17 06:18:56.315445 +0000'
self.end_time = None
self.desc = dumps(desc)
self.arguments = " ".join(args)
self.command = cmd
self.acknowledge = None
self.process_state = 0
mock_result = process_mock.query.filter_by.return_value
mock_result.first.return_value = TestMockProcess(
backup_obj, self.class_params['args'], self.class_params['cmd'])
cmd_test = self.class_params['cmd']
assert_true = self.assertTrue
@@ -202,6 +220,7 @@ class BatchProcessTest(BaseTestGenerator):
self.arguments = " ".join(args)
self.command = cmd
self.acknowledge = None
self.process_state = 0
process_mock.query.filter_by.return_value = [
TestMockProcess(backup_obj,

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

@@ -15,9 +15,9 @@ from pgadmin.utils.route import BaseTestGenerator
from pickle import dumps, loads
if sys.version_info < (3, 3):
from mock import patch
from mock import patch, MagicMock
else:
from unittest.mock import patch
from unittest.mock import patch, MagicMock
class BatchProcessTest(BaseTestGenerator):
@@ -89,6 +89,7 @@ class BatchProcessTest(BaseTestGenerator):
mock_result.first.return_value = mock_obj
db_mock.session.add.side_effect = db_session_add_mock
db_mock.session.commit = MagicMock(return_value=True)
maintenance_obj = Message(
self.class_params['sid'],
@@ -106,12 +107,30 @@ class BatchProcessTest(BaseTestGenerator):
self.assertTrue(db_mock.session.add.called)
# Check start method
self._check_start(popen_mock, p)
self._check_start(popen_mock, p, maintenance_obj)
# Check list method
self._check_list(p, maintenance_obj)
def _check_start(self, popen_mock, p):
@patch('pgadmin.misc.bgprocess.processes.Process')
def _check_start(self, popen_mock, p, maintenance_obj, process_mock):
class TestMockProcess():
def __init__(self, desc, args, cmd):
self.pid = 1
self.exit_code = 1
self.start_time = '2018-04-17 06:18:56.315445 +0000'
self.end_time = None
self.desc = dumps(desc)
self.arguments = " ".join(args)
self.command = cmd
self.acknowledge = None
self.process_state = 0
mock_result = process_mock.query.filter_by.return_value
mock_result.first.return_value = TestMockProcess(
maintenance_obj, self.class_params['args'],
self.class_params['cmd'])
cmd_test = self.class_params['cmd']
assert_true = self.assertTrue
@@ -143,6 +162,7 @@ class BatchProcessTest(BaseTestGenerator):
self.arguments = " ".join(args)
self.command = cmd
self.acknowledge = None
self.process_state = 0
process_mock.query.filter_by.return_value = [
TestMockProcess(maintenance_obj,

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

@@ -15,9 +15,9 @@ from pgadmin.utils.route import BaseTestGenerator
from pickle import dumps, loads
if sys.version_info < (3, 3):
from mock import patch
from mock import patch, MagicMock
else:
from unittest.mock import patch
from unittest.mock import patch, MagicMock
class BatchProcessTest(BaseTestGenerator):
@@ -89,6 +89,7 @@ class BatchProcessTest(BaseTestGenerator):
self.class_params['port']
db_mock.session.add.side_effect = db_session_add_mock
db_mock.session.commit = MagicMock(return_value=True)
restore_obj = RestoreMessage(
self.class_params['sid'],
@@ -106,12 +107,30 @@ class BatchProcessTest(BaseTestGenerator):
self.assertTrue(db_mock.session.add.called)
# Check start method
self._check_start(popen_mock, p)
self._check_start(popen_mock, p, restore_obj)
# Check list method
self._check_list(p, restore_obj)
def _check_start(self, popen_mock, p):
@patch('pgadmin.misc.bgprocess.processes.Process')
def _check_start(self, popen_mock, p, restore_obj, process_mock):
class TestMockProcess():
def __init__(self, desc, args, cmd):
self.pid = 1
self.exit_code = 1
self.start_time = '2018-04-17 06:18:56.315445 +0000'
self.end_time = None
self.desc = dumps(desc)
self.arguments = " ".join(args)
self.command = cmd
self.acknowledge = None
self.process_state = 0
mock_result = process_mock.query.filter_by.return_value
mock_result.first.return_value = TestMockProcess(
restore_obj, self.class_params['args'],
self.class_params['cmd'])
cmd_test = self.class_params['cmd']
assert_true = self.assertTrue
@@ -143,6 +162,7 @@ class BatchProcessTest(BaseTestGenerator):
self.arguments = " ".join(args)
self.command = cmd
self.acknowledge = None
self.process_state = 0
process_mock.query.filter_by.return_value = [
TestMockProcess(restore_obj,