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

Fixed API test cases for backup, restore and maintenance.

Browse Source
This commit is contained in:
Aditya Toshniwal
2020-04-27 21:17:34 +05:30
committed by Akshay Joshi
parent fbee63085c
commit b695329d2d
3 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
web/pgadmin/tools/backup/tests/test_backup_utils.py
View File

@@ -26,6 +26,7 @@ def create_backup_job(tester, url, params, assert_equal):
def run_backup_job(tester, job_id, expected_params, assert_in, assert_not_in, def run_backup_job(tester, job_id, expected_params, assert_in, assert_not_in,
assert_equal): assert_equal):
cnt = 0 cnt = 0
the_process = None
while 1: while 1:
if cnt >= 5: if cnt >= 5:
break break
@@ -35,30 +36,36 @@ def run_backup_job(tester, job_id, expected_params, assert_in, assert_not_in,
assert_equal(response1.status_code, 200) assert_equal(response1.status_code, 200)
process_list = json.loads(response1.data.decode('utf-8')) process_list = json.loads(response1.data.decode('utf-8'))
if len(process_list) > 0 and 'execution_time' in process_list[0]: try:
the_process = next(
p for p in process_list if p['id'] == job_id)
except Exception as _:
the_process = None
if the_process and 'execution_time' in the_process:
break break
time.sleep(0.5) time.sleep(0.5)
cnt += 1 cnt += 1
assert_equal('execution_time' in process_list[0], True) assert_equal('execution_time' in the_process, True)
assert_equal('stime' in process_list[0], True) assert_equal('stime' in the_process, True)
assert_equal('exit_code' in process_list[0], True) assert_equal('exit_code' in the_process, True)
assert_equal(process_list[0]['exit_code'] in expected_params[ assert_equal(the_process['exit_code'] in expected_params[
'expected_exit_code' 'expected_exit_code'
], True) ], True)
backup_file = None backup_file = None
if 'details' in process_list[0]: if 'details' in the_process:
backup_det = process_list[0]['details'] backup_det = the_process['details']
backup_file = backup_det[int(backup_det.find('--file')) + backup_file = backup_det[int(backup_det.find('--file')) +
8:int(backup_det.find('--host')) - 2] 8:int(backup_det.find('--host')) - 2]
if expected_params['expected_cmd_opts']: if expected_params['expected_cmd_opts']:
for opt in expected_params['expected_cmd_opts']: for opt in expected_params['expected_cmd_opts']:
assert_in(opt, process_list[0]['details']) assert_in(opt, the_process['details'])
if expected_params['not_expected_cmd_opts']: if expected_params['not_expected_cmd_opts']:
for opt in expected_params['not_expected_cmd_opts']: for opt in expected_params['not_expected_cmd_opts']:
assert_not_in(opt, process_list[0]['details']) assert_not_in(opt, the_process['details'])
# Check the process details # Check the process details
p_details = tester.get('/misc/bgprocess/{0}?_='.format( p_details = tester.get('/misc/bgprocess/{0}?_='.format(

19
web/pgadmin/tools/maintenance/tests/test_create_maintenance_job.py
View File

@@ -74,6 +74,7 @@ class MaintenanceJobTest(BaseTestGenerator):
job_id = response_data['data']['job_id'] job_id = response_data['data']['job_id']
cnt = 0 cnt = 0
the_process = None
while 1: while 1:
if cnt >= 10: if cnt >= 10:
break break
@@ -83,18 +84,24 @@ class MaintenanceJobTest(BaseTestGenerator):
self.assertEqual(response1.status_code, 200) self.assertEqual(response1.status_code, 200)
process_list = json.loads(response1.data.decode('utf-8')) process_list = json.loads(response1.data.decode('utf-8'))
if len(process_list) > 0 and 'execution_time' in process_list[0]: try:
the_process = next(
p for p in process_list if p['id'] == job_id)
except Exception as _:
the_process = None
if the_process and 'execution_time' in the_process:
break break
time.sleep(0.5) time.sleep(0.5)
cnt += 1 cnt += 1
self.assertTrue('execution_time' in process_list[0]) self.assertTrue('execution_time' in the_process)
self.assertTrue('stime' in process_list[0]) self.assertTrue('stime' in the_process)
self.assertTrue('exit_code' in process_list[0]) self.assertTrue('exit_code' in the_process)
self.assertTrue(process_list[0]['exit_code'] in self.assertTrue(the_process['exit_code'] in
self.expected_exit_code) self.expected_exit_code)
self.assertIn(self.expected_cmd, process_list[0]['details']) self.assertIn(self.expected_cmd, the_process['details'])
# Check the process details # Check the process details
p_details = self.tester.get('/misc/bgprocess/{0}?_='.format( p_details = self.tester.get('/misc/bgprocess/{0}?_='.format(

21
web/pgadmin/tools/restore/tests/test_create_restore_job.py
View File

@@ -115,6 +115,7 @@ class RestoreJobTest(BaseTestGenerator):
job_id = response_data['data']['job_id'] job_id = response_data['data']['job_id']
cnt = 0 cnt = 0
the_process = None
while 1: while 1:
if cnt >= 5: if cnt >= 5:
break break
@@ -124,23 +125,29 @@ class RestoreJobTest(BaseTestGenerator):
self.assertEqual(response1.status_code, 200) self.assertEqual(response1.status_code, 200)
process_list = json.loads(response1.data.decode('utf-8')) process_list = json.loads(response1.data.decode('utf-8'))
if len(process_list) > 0 and 'execution_time' in process_list[0]: try:
the_process = next(
p for p in process_list if p['id'] == job_id)
except Exception as _:
the_process = None
if the_process and 'execution_time' in the_process:
break break
time.sleep(0.5) time.sleep(0.5)
cnt += 1 cnt += 1
self.assertTrue('execution_time' in process_list[0]) self.assertTrue('execution_time' in the_process)
self.assertTrue('stime' in process_list[0]) self.assertTrue('stime' in the_process)
self.assertTrue('exit_code' in process_list[0]) self.assertTrue('exit_code' in the_process)
self.assertTrue(process_list[0]['exit_code'] in self.assertTrue(the_process['exit_code'] in
self.expected_exit_code) self.expected_exit_code)
if self.expected_cmd_opts: if self.expected_cmd_opts:
for opt in self.expected_cmd_opts: for opt in self.expected_cmd_opts:
self.assertIn(opt, process_list[0]['details']) self.assertIn(opt, the_process['details'])
if self.not_expected_cmd_opts: if self.not_expected_cmd_opts:
for opt in self.not_expected_cmd_opts: for opt in self.not_expected_cmd_opts:
self.assertNotIn(opt, process_list[0]['details']) self.assertNotIn(opt, the_process['details'])
# Check the process details # Check the process details
p_details = self.tester.get('/misc/bgprocess/{0}?_='.format( p_details = self.tester.get('/misc/bgprocess/{0}?_='.format(