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

Change the following to replace Python 2 code with Python 3:

Browse Source 
1) Replace the deprecated unit test method.
2) Wraps filter usage in a list call.
3) Converts the old metaclass syntax to new.
4) Use range instead of xrange method.
5) Change Unicode to str.
6) Several other transformations.
7) Fixed change password test cases.
8) Use simplejson instead of plain JSON.
This commit is contained in:
Cyril Jouve
2020-08-31 16:45:31 +05:30
committed by Akshay Joshi
parent 11d5613866
commit 5a253f9053
385 changed files with 938 additions and 944 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web/regression/python_test_utils/test_utils.py
View File

@@ -1100,7 +1100,7 @@ def get_server_type(server):
pg_cursor.execute("SELECT version()")
version_string = pg_cursor.fetchone()
connection.close()
if type(version_string) == tuple:
if isinstance(version_string, tuple):
version_string = version_string[0]
if "Greenplum Database" in version_string:
@@ -1208,7 +1208,7 @@ def generate_scenarios(key, test_cases):
def assert_status_code(self, response):
act_res = response.status_code
exp_res = self.expected_data["status_code"]
return self.assertEquals(act_res, exp_res)
return self.assertEqual(act_res, exp_res)
def assert_error_message(self, response, error_msg=None):
@@ -1217,7 +1217,7 @@ def assert_error_message(self, response, error_msg=None):
exp_res = error_msg
else:
exp_res = self.expected_data["error_msg"]
return self.assertEquals(act_res, exp_res)
return self.assertEqual(act_res, exp_res)
def create_expected_output(parameters, actual_data):
@@ -1406,9 +1406,7 @@ def get_parallel_sequential_module_list(module_list):
parallel_tests.remove(module)
# list of tests can be executed in sequentially
sequential_tests = list(
filter(lambda i: i not in parallel_tests,
module_list))
sequential_tests = [i for i in module_list if i not in parallel_tests]
# return parallel & sequential lists
return parallel_tests, sequential_tests

18
web/regression/re_sql/tests/test_resql.py
View File

@@ -268,7 +268,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator):
data=json.dumps(scenario['data']),
content_type='html/json')
try:
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
except Exception as e:
self.final_test_status = False
print(scenario['name'] + "... FAIL")
@@ -302,7 +302,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator):
data=json.dumps(scenario['data']),
follow_redirects=True)
try:
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
except Exception as e:
self.final_test_status = False
print(scenario['name'] + "... FAIL")
@@ -328,7 +328,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator):
delete_url, data=json.dumps(scenario.get('data', {})),
follow_redirects=True)
try:
self.assertEquals(delete_response.status_code, 200)
self.assertEqual(delete_response.status_code, 200)
except Exception as e:
self.final_test_status = False
print(scenario['name'] + "... FAIL")
@@ -395,14 +395,14 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator):
response = self.tester.get(url,
follow_redirects=True)
try:
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
except Exception as e:
self.final_test_status = False
print(scenario['name'] + "... FAIL")
traceback.print_exc()
return False
try:
if type(response.data) == bytes:
if isinstance(response.data, bytes):
response_data = response.data.decode('utf8')
resp = json.loads(response_data)
else:
@@ -432,7 +432,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator):
sql = self.preprocess_expected_sql(scenario, sql, resp_sql,
object_id)
try:
self.assertEquals(sql, resp_sql)
self.assertEqual(sql, resp_sql)
except Exception as e:
self.final_test_status = False
traceback.print_exc()
@@ -458,7 +458,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator):
response = self.tester.get(sql_url)
try:
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
except Exception as e:
self.final_test_status = False
@@ -487,7 +487,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator):
sql = self.preprocess_expected_sql(scenario, sql, resp_sql,
object_id)
try:
self.assertEquals(sql, resp_sql)
self.assertEqual(sql, resp_sql)
except Exception as e:
self.final_test_status = False
traceback.print_exc()
@@ -504,7 +504,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator):
exp_sql = self.preprocess_expected_sql(scenario, exp_sql, resp_sql,
object_id)
try:
self.assertEquals(exp_sql, resp_sql)
self.assertEqual(exp_sql, resp_sql)
except Exception as e:
self.final_test_status = False
traceback.print_exc()

19
web/regression/runtests.py
View File

@@ -127,6 +127,25 @@ app.test_client_class = TestClient
test_client = app.test_client()
test_client.setApp(app)
class CaptureMail:
# A hack Mail service that simply captures what would be sent.
def __init__(self, app):
app.extensions["mail"] = self
self.sent = []
self.ascii_attachments = []
def send(self, msg):
self.sent.append(msg.body)
def pop(self):
if len(self.sent):
return self.sent.pop(0)
return None
CaptureMail(app)
setattr(unittest.result.TestResult, "passed", [])
unittest.runner.TextTestResult.addSuccess = test_utils.add_success

2
web/regression/test_config.json.in
View File

@@ -9,7 +9,7 @@
"pgAdmin4_test_user_credentials": {
"new_password": "NEWPASSWORD",
"login_password": "PASSWORD",
"login_username": "USER@EXAMPLE.COM"
"login_username": "USER2@EXAMPLE.COM"
},
"pgAdmin4_ldap_credentials": {
"login_password": "PASSWORD",