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

Remove Python 2 support from the Python tests.

Browse Source 
refs #5443
This commit is contained in:
Dave Page
2020-04-30 12:56:45 +05:30
committed by Akshay Joshi
parent 393741fd9d
commit 86afec860f
55 changed files with 76 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,18 +7,12 @@
#
##########################################################################
import sys
from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc, \
current_app
from pgadmin.tools.restore import RestoreMessage
from pgadmin.utils.route import BaseTestGenerator
from pickle import dumps, loads
if sys.version_info < (3, 3):
from mock import patch, MagicMock
else:
from unittest.mock import patch, MagicMock
from unittest.mock import patch, MagicMock
class BatchProcessTest(BaseTestGenerator):

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

@@ -7,16 +7,11 @@
#
##########################################################################
import sys
import json
from pgadmin.utils.route import BaseTestGenerator
from regression.python_test_utils.test_utils import\
check_binary_path_or_skip_test
if sys.version_info < (3, 3):
from mock import patch
else:
from unittest.mock import patch
from unittest.mock import patch
class TestUtilityCheckRouteCase(BaseTestGenerator):

9
web/pgadmin/tools/restore/tests/test_restore_create_job_unit_test.py
View File

@@ -7,7 +7,6 @@
#
##########################################################################
import sys
import simplejson as json
import os
@@ -16,11 +15,7 @@ from regression import parent_node_dict
from pgadmin.utils import server_utils as server_utils, does_utility_exist
from pgadmin.browser.server_groups.servers.databases.tests import utils as \
database_utils
if sys.version_info < (3, 3):
from mock import patch, MagicMock
else:
from unittest.mock import patch, MagicMock
from unittest.mock import patch, MagicMock
class RestoreCreateJobTest(BaseTestGenerator):
@@ -233,7 +228,7 @@ class RestoreCreateJobTest(BaseTestGenerator):
not_expected_cmd_opts=[],
expected_exit_code=[0, None]
)),
('When restore object with option - Disbale',
('When restore object with option - Disable Triggers',
dict(
class_params=dict(
sid=1,

8
web/pgadmin/tools/restore/tests/test_restore_message.py
View File

@@ -7,15 +7,9 @@
#
##########################################################################
import sys
from pgadmin.tools.restore import RestoreMessage
from pgadmin.utils.route import BaseTestGenerator
if sys.version_info < (3, 3):
from mock import patch
else:
from unittest.mock import patch
from unittest.mock import patch
class RestoreMessageTest(BaseTestGenerator):