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

3
web/pgadmin/tools/sqleditor/tests/test_download_csv_query_tool.py
View File

@@ -12,10 +12,9 @@ from unittest.mock import patch
from pgadmin.utils.route import BaseTestGenerator
from pgadmin.browser.server_groups.servers.databases.tests import utils as \
database_utils
from regression import parent_node_dict
from regression.python_test_utils import test_utils
import json
from pgadmin.utils import server_utils, IS_PY2
from pgadmin.utils import server_utils
import random

7
web/pgadmin/tools/sqleditor/tests/test_encoding_charset.py
View File

@@ -13,7 +13,7 @@ from pgadmin.browser.server_groups.servers.databases.tests import utils as \
database_utils
from regression.python_test_utils import test_utils
import json
from pgadmin.utils import server_utils, IS_PY2
from pgadmin.utils import server_utils
import random
@@ -273,10 +273,7 @@ class TestEncodingCharset(BaseTestGenerator):
self.assertEquals(response.status_code, 200)
response_data = json.loads(response.data.decode('utf-8'))
self.assertEquals(response_data['data']['rows_fetched_to'], 1)
if IS_PY2 and type(response_data['data']['result'][0][0]) == unicode:
result = response_data['data']['result'][0][0].encode('utf-8')
else:
result = response_data['data']['result'][0][0]
result = response_data['data']['result'][0][0]
self.assertEquals(result, self.test_str)
database_utils.disconnect_database(self, self.encode_sid,

6
web/pgadmin/tools/sqleditor/tests/test_sql_ascii_encoding.py
View File

@@ -104,11 +104,7 @@ class TestSQLASCIIEncoding(BaseTestGenerator):
pg_cursor.execute(query)
resp = pg_cursor.fetchone()
if sys.version_info < (3,):
self.assertEqual(resp[0].encode("raw_unicode_escape"),
self.test_str)
else:
self.assertEqual(resp[0], self.test_str)
self.assertEqual(resp[0], self.test_str)
def tearDown(self):
main_conn = test_utils.get_db_connection(

7
web/pgadmin/tools/sqleditor/tests/test_start_query_tool.py
View File

@@ -6,15 +6,10 @@
# This software is released under the PostgreSQL Licence
#
##########################################################################
import sys
from pgadmin.utils.route import BaseTestGenerator
from pgadmin.tools.sqleditor import StartRunningQuery
if sys.version_info < (3, 3):
from mock import patch, ANY
else:
from unittest.mock import patch, ANY
from unittest.mock import patch, ANY
class StartQueryTool(BaseTestGenerator):

9
web/pgadmin/tools/sqleditor/tests/test_view_data.py
View File

@@ -10,19 +10,12 @@
import uuid
import json
import random
import sys
from pgadmin.utils.route import BaseTestGenerator
from pgadmin.browser.server_groups.servers.databases.tests import utils as \
database_utils
from regression import parent_node_dict
from regression.python_test_utils import test_utils
from pgadmin.utils import server_utils, IS_PY2
if sys.version_info < (3, 3):
from mock import patch
else:
from unittest.mock import patch
from unittest.mock import patch
class TestViewData(BaseTestGenerator):

7
web/pgadmin/tools/sqleditor/utils/tests/test_apply_explain_plan_wrapper.py
View File

@@ -8,15 +8,10 @@
##########################################################################
"""Apply Explain plan wrapper to sql object."""
import sys
from pgadmin.tools.sqleditor.utils import apply_explain_plan_wrapper_if_needed
from pgadmin.utils.route import BaseTestGenerator
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 StartRunningQueryTest(BaseTestGenerator):

7
web/pgadmin/tools/sqleditor/utils/tests/test_start_running_query.py
View File

@@ -6,7 +6,6 @@
# This software is released under the PostgreSQL Licence
#
##########################################################################
import sys
from flask import Response
import simplejson as json
@@ -14,11 +13,7 @@ import simplejson as json
from pgadmin.tools.sqleditor.utils.start_running_query import StartRunningQuery
from pgadmin.utils.exception import ConnectionLost, SSHTunnelConnectionLost
from pgadmin.utils.route import BaseTestGenerator
if sys.version_info < (3, 3):
from mock import patch, MagicMock
else:
from unittest.mock import patch, MagicMock
from unittest.mock import patch, MagicMock
get_driver_exception = Exception('get_driver exception')
get_connection_lost_exception = Exception('Unable to connect to server')