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

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

@@ -119,7 +119,7 @@ class TestDownloadCSV(BaseTestGenerator):
url = self.init_url.format(
self.trans_id, test_utils.SERVER_GROUP, self._sid, self._did)
response = self.tester.post(url)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
# If invalid tx test then make the Tx id invalid so that tests fails
if not self.is_valid_tx:
@@ -137,7 +137,7 @@ class TestDownloadCSV(BaseTestGenerator):
response = self.tester.post(url, data={"query": self.sql})
headers = dict(response.headers)
# when valid query
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
csv_data = response.data.decode()
self.assertTrue(self.output_columns in csv_data)
self.assertTrue(self.output_values in csv_data)
@@ -149,7 +149,7 @@ class TestDownloadCSV(BaseTestGenerator):
response = self.tester.post(url, data={"query": self.sql})
headers = dict(response.headers)
# when valid query
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
csv_data = response.data.decode()
self.assertTrue(self.output_columns in csv_data)
self.assertTrue(self.output_values in csv_data)
@@ -167,7 +167,7 @@ class TestDownloadCSV(BaseTestGenerator):
self.app.logger.disabled = False
if self.is_valid:
# when valid query
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
csv_data = response.data.decode()
self.assertTrue(self.output_columns in csv_data)
self.assertTrue(self.output_values in csv_data)
@@ -175,7 +175,7 @@ class TestDownloadCSV(BaseTestGenerator):
self.assertIn(self.filename, headers['Content-Disposition'])
elif not self.is_valid and self.is_valid_tx:
# When user enters wrong query
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
response_data = json.loads(response.data.decode('utf-8'))
self.assertFalse(response_data['data']['status'])
self.assertTrue(
@@ -184,7 +184,7 @@ class TestDownloadCSV(BaseTestGenerator):
)
else:
# when TX id is invalid
self.assertEquals(response.status_code, 500)
self.assertEqual(response.status_code, 500)
database_utils.disconnect_database(self, self._sid, self._did)

18
web/pgadmin/tools/sqleditor/tests/test_editor_history.py
View File

@@ -73,31 +73,31 @@ class TestEditorHistory(BaseTestGenerator):
url = '/datagrid/initialize/query_tool/{0}/{1}/{2}/{3}'.format(
self.trans_id, utils.SERVER_GROUP, self.server_id, self.db_id)
response = self.tester.post(url)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
def runTest(self):
url = '/sqleditor/query_history/{0}'.format(self.trans_id)
if not self.clear:
response = self.tester.post(url, data=self.entry)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
response = self.tester.get(url)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
response_data = json.loads(response.data.decode('utf-8'))
self.assertEquals(len(response_data['data']['result']),
self.expected_len)
self.assertEqual(len(response_data['data']['result']),
self.expected_len)
else:
response = self.tester.delete(url)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
response = self.tester.get(url)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
response_data = json.loads(response.data.decode('utf-8'))
self.assertEquals(len(response_data['data']['result']),
self.expected_len)
self.assertEqual(len(response_data['data']['result']),
self.expected_len)
def tearDown(self):
# Disconnect the database

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

@@ -260,21 +260,21 @@ class TestEncodingCharset(BaseTestGenerator):
.format(self.trans_id, test_utils.SERVER_GROUP, self.encode_sid,
self.encode_did)
response = self.tester.post(url)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
# Check character
url = "/sqleditor/query_tool/start/{0}".format(self.trans_id)
sql = "select E'{0}';".format(self.test_str)
response = self.tester.post(url, data=json.dumps({"sql": sql}),
content_type='html/json')
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
url = '/sqleditor/poll/{0}'.format(self.trans_id)
response = self.tester.get(url)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
response_data = json.loads(response.data.decode('utf-8'))
self.assertEquals(response_data['data']['rows_fetched_to'], 1)
self.assertEqual(response_data['data']['rows_fetched_to'], 1)
result = response_data['data']['result'][0][0]
self.assertEquals(result, self.test_str)
self.assertEqual(result, self.test_str)
database_utils.disconnect_database(self, self.encode_sid,
self.encode_did)

10
web/pgadmin/tools/sqleditor/tests/test_explain_plan.py
View File

@@ -37,7 +37,7 @@ class TestExplainPlan(BaseTestGenerator):
url = '/datagrid/initialize/query_tool/{0}/{1}/{2}/{3}'.format(
self.trans_id, utils.SERVER_GROUP, self.server_id, self.db_id)
response = self.tester.post(url)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
# Start query tool transaction
url = '/sqleditor/query_tool/start/{0}'.format(self.trans_id)
@@ -55,17 +55,17 @@ class TestExplainPlan(BaseTestGenerator):
}
}), content_type='html/json')
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
# Query tool polling
url = '/sqleditor/poll/{0}'.format(self.trans_id)
response = self.tester.get(url)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
response_data = json.loads(response.data.decode('utf-8'))
# Check the ouput of explain plan
self.assertEquals(len(response_data['data']['result']), 1)
self.assertEquals(len(response_data['data']['result'][0]), 1)
self.assertEqual(len(response_data['data']['result']), 1)
self.assertEqual(len(response_data['data']['result'][0]), 1)
# Disconnect the database
database_utils.disconnect_database(self, self.server_id, self.db_id)

2
web/pgadmin/tools/sqleditor/tests/test_extract_sql_from_network_parameters.py
View File

@@ -59,4 +59,4 @@ class ExtractSQLFromNetworkParametersTest(BaseTestGenerator):
self.request_form_data
)
self.assertEquals(result, self.expected_result)
self.assertEqual(result, self.expected_result)

10
web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py
View File

@@ -80,7 +80,7 @@ NOTICE: Hello, world!
url = '/datagrid/initialize/query_tool/{0}/{1}/{2}/{3}'.format(
self.trans_id, utils.SERVER_GROUP, self.server_id, self.db_id)
response = self.tester.post(url)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
cnt = 0
for s in self.sql:
@@ -90,12 +90,12 @@ NOTICE: Hello, world!
response = self.tester.post(url, data=json.dumps({"sql": s}),
content_type='html/json')
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
# Query tool polling
url = '/sqleditor/poll/{0}'.format(self.trans_id)
response = self.tester.get(url)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
response_data = json.loads(response.data.decode('utf-8'))
if self.expected_message[cnt] is not None:
@@ -104,8 +104,8 @@ NOTICE: Hello, world!
response_data['data']['additional_messages'])
# Check the output
self.assertEquals(self.expected_result[cnt],
response_data['data']['result'][0][0])
self.assertEqual(self.expected_result[cnt],
response_data['data']['result'][0][0])
cnt += 1

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

@@ -34,8 +34,8 @@ class StartQueryTool(BaseTestGenerator):
data='"some sql statement"'
)
self.assertEquals(response.status, '200 OK')
self.assertEquals(response.data, b'some result')
self.assertEqual(response.status, '200 OK')
self.assertEqual(response.data, b'some result')
StartRunningQuery_execute_mock \
.assert_called_with('transformed sql', 1234, ANY, False)
extract_sql_from_network_parameters_mock \

14
web/pgadmin/tools/sqleditor/tests/test_transaction_status.py
View File

@@ -246,7 +246,7 @@ class TestTransactionControl(BaseTestGenerator):
response = self.tester.post(self.auto_commit_url,
data=json.dumps(auto_commit),
content_type='html/json')
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
def _execute_select_sql(self):
is_success, _ = \
@@ -254,22 +254,22 @@ class TestTransactionControl(BaseTestGenerator):
query=self.select_sql,
start_query_tool_url=self.start_query_tool_url,
poll_url=self.poll_url)
self.assertEquals(is_success, True)
self.assertEqual(is_success, True)
def _check_transaction_status(self, expected_transaction_status):
# Check transaction status
response = self.tester.get(self.status_url)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
response_data = json.loads(response.data.decode('utf-8'))
transaction_status = response_data['data']['status']
self.assertEquals(transaction_status, expected_transaction_status)
self.assertEqual(transaction_status, expected_transaction_status)
def _save_changed_data(self):
response = self.tester.post(self.save_url,
data=json.dumps(self.save_payload),
content_type='html/json')
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
def _commit_transaction(self):
is_success, _ = \
@@ -277,7 +277,7 @@ class TestTransactionControl(BaseTestGenerator):
query='COMMIT;',
start_query_tool_url=self.start_query_tool_url,
poll_url=self.poll_url)
self.assertEquals(is_success, True)
self.assertEqual(is_success, True)
def _initialize_database_connection(self):
database_info = parent_node_dict["database"][-1]
@@ -305,7 +305,7 @@ class TestTransactionControl(BaseTestGenerator):
url = '/datagrid/initialize/query_tool/{0}/{1}/{2}/{3}'.format(
self.trans_id, utils.SERVER_GROUP, self.server_id, self.db_id)
response = self.tester.post(url)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
def _initialize_urls(self):
self.start_query_tool_url = \

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

@@ -111,21 +111,21 @@ class TestViewData(BaseTestGenerator):
else:
response = self.tester.post(url)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
url = "/sqleditor/view_data/start/{0}".format(self.trans_id)
response = self.tester.get(url)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
# Check the query result
url = '/sqleditor/poll/{0}'.format(self.trans_id)
response = self.tester.get(url)
self.assertEquals(response.status_code, 200)
self.assertEqual(response.status_code, 200)
response_data = json.loads(response.data.decode('utf-8'))
self.assertEquals(response_data['data']['result'], self.result_data)
self.assertEquals(response_data['data']['rows_fetched_to'],
self.rows_fetched_to)
self.assertEqual(response_data['data']['result'], self.result_data)
self.assertEqual(response_data['data']['rows_fetched_to'],
self.rows_fetched_to)
def tearDown(self):
database_utils.disconnect_database(self, self.server_id,