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.6 code that's now obsolete. Fixes #3935

Browse Source
This commit is contained in:
Cyril Jouve
2019-01-31 13:47:56 +01:00
committed by Dave Page
parent 38feacd04d
commit cbd8f8236a
10 changed files with 24 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,10 +119,7 @@ class BatchProcessTest(BaseTestGenerator):
current_app_mock.PGADMIN_RUNTIME = False
def db_session_add_mock(j):
if sys.version_info < (2, 7):
cmd_obj = loads(str(j.desc))
else:
cmd_obj = loads(j.desc)
cmd_obj = loads(j.desc)
self.assertTrue(isinstance(cmd_obj, IProcessDesc))
self.assertEqual(cmd_obj.backup_type, self.class_params['type'])
self.assertEqual(cmd_obj.bfile, self.class_params['bfile'])

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

@@ -73,10 +73,7 @@ class BatchProcessTest(BaseTestGenerator):
self.port = port
def db_session_add_mock(j):
if sys.version_info < (2, 7):
cmd_obj = loads(str(j.desc))
else:
cmd_obj = loads(j.desc)
cmd_obj = loads(j.desc)
self.assertTrue(isinstance(cmd_obj, IProcessDesc))
self.assertEqual(cmd_obj.query, self.class_params['cmd'])
self.assertEqual(cmd_obj.message, self.expected_msg)

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

@@ -64,10 +64,7 @@ class BatchProcessTest(BaseTestGenerator):
current_app_mock.PGADMIN_RUNTIME = False
def db_session_add_mock(j):
if sys.version_info < (2, 7):
cmd_obj = loads(str(j.desc))
else:
cmd_obj = loads(j.desc)
cmd_obj = loads(j.desc)
self.assertTrue(isinstance(cmd_obj, IProcessDesc))
self.assertEqual(cmd_obj.bfile, self.class_params['bfile'])
self.assertEqual(cmd_obj.cmd,

5
web/pgadmin/utils/route.py
View File

@@ -16,10 +16,7 @@ import six
from werkzeug.utils import find_modules
from pgadmin.utils import server_utils
if sys.version_info < (2, 7):
import unittest2 as unittest
else:
import unittest
import unittest
class TestsGeneratorRegistry(ABCMeta):

6
web/pgadmin/utils/sqlautocomplete/autocomplete.py
View File

@@ -14,11 +14,7 @@ import operator
import sys
from itertools import count, repeat, chain
from .completion import Completion
from collections import namedtuple, defaultdict
if sys.version_info < (2, 7):
from ordereddict import OrderedDict
else:
from collections import OrderedDict
from collections import namedtuple, defaultdict, OrderedDict
from .sqlcompletion import (
FromClauseItem, suggest_type, Database, Schema, Table,

12
web/regression/requirements.txt
View File

@@ -11,17 +11,7 @@ pyperclip~=1.6.0
testscenarios==0.5.0
testtools==2.3.0
traceback2==1.4.0
unittest2==1.1.0
################################################################
# Modules specifically requires for Python2.7 or greater version
################################################################
selenium==3.11.0; python_version >= '2.7'
###############################################################
# Modules required for Python2.6
###############################################################
selenium==3.3.3; python_version < '2.7'
selenium==3.11.0
###############################################################
# Modules specifically required for Python3.3 or lesser version

19
web/regression/runtests.py
View File

@@ -25,10 +25,7 @@ from selenium import webdriver
from selenium.webdriver.chrome.options import Options
from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
if sys.version_info < (2, 7):
import unittest2 as unit_test
else:
import unittest as unit_test
import unittest
if sys.version_info[0] >= 3:
import builtins
@@ -119,9 +116,9 @@ app.PGADMIN_RUNTIME = True
if config.SERVER_MODE is True:
app.PGADMIN_RUNTIME = False
setattr(unit_test.result.TestResult, "passed", [])
setattr(unittest.result.TestResult, "passed", [])
unit_test.runner.TextTestResult.addSuccess = test_utils.add_success
unittest.runner.TextTestResult.addSuccess = test_utils.add_success
# Override apply_scenario method as we need custom test description/name
scenarios.apply_scenario = test_utils.apply_scenario
@@ -143,7 +140,7 @@ def get_suite(module_list, test_server, test_app_client, server_information,
:rtype: TestSuite
"""
modules = []
pgadmin_suite = unit_test.TestSuite()
pgadmin_suite = unittest.TestSuite()
# Get the each test module and add into list
for key, klass in module_list:
@@ -423,9 +420,9 @@ if __name__ == '__main__':
server,
test_client,
server_information, test_db_name)
tests = unit_test.TextTestRunner(stream=sys.stderr,
descriptions=True,
verbosity=2).run(suite)
tests = unittest.TextTestRunner(stream=sys.stderr,
descriptions=True,
verbosity=2).run(suite)
ran_tests, failed_cases, skipped_cases, passed_cases = \
get_tests_result(tests)
@@ -434,7 +431,7 @@ if __name__ == '__main__':
# Set empty list for 'passed' parameter for each testRun.
# So that it will not append same test case name
unit_test.result.TestResult.passed = []
unittest.result.TestResult.passed = []
if len(failed_cases) > 0:
failure = True