IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-11-23 09:16:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix external utility tests to run on Windows

Browse Source
This commit is contained in:
Dave Page 2019-07-12 13:55:18 +01:00
parent 3f4d5a687b
commit 6b5ca07715
6 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgadmin/tools/backup/tests/test_backup_create_job_unit_test.py
View File

@ -653,6 +653,10 @@ class BackupCreateJobTest(BaseTestGenerator):
binary_path = os.path.join( binary_path = os.path.join(
self.server['default_binary_paths'][self.server['type']], self.server['default_binary_paths'][self.server['type']],
'pg_dump') 'pg_dump')
if os.name == 'nt':
binary_path = binary_path + '.exe'
retVal = does_utility_exist(binary_path) retVal = does_utility_exist(binary_path)
if retVal is not None: if retVal is not None:
self.skipTest(retVal) self.skipTest(retVal)

4
web/pgadmin/tools/backup/tests/test_create_backup_job.py
View File

@ -52,6 +52,10 @@ class BackupJobTest(BaseTestGenerator):
binary_path = os.path.join( binary_path = os.path.join(
self.server['default_binary_paths'][self.server['type']], self.server['default_binary_paths'][self.server['type']],
'pg_dump') 'pg_dump')
if os.name == 'nt':
binary_path = binary_path + '.exe'
retVal = does_utility_exist(binary_path) retVal = does_utility_exist(binary_path)
if retVal is not None: if retVal is not None:
self.skipTest(retVal) self.skipTest(retVal)

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

@ -52,6 +52,10 @@ class MaintenanceJobTest(BaseTestGenerator):
binary_path = os.path.join( binary_path = os.path.join(
self.server['default_binary_paths'][self.server['type']], 'psql') self.server['default_binary_paths'][self.server['type']], 'psql')
if os.name == 'nt':
binary_path = binary_path + '.exe'
retVal = does_utility_exist(binary_path) retVal = does_utility_exist(binary_path)
if retVal is not None: if retVal is not None:
self.skipTest(retVal) self.skipTest(retVal)

4
web/pgadmin/tools/maintenance/tests/test_maintenance_create_job_unit_test.py
View File

@ -141,6 +141,10 @@ class MaintenanceCreateJobTest(BaseTestGenerator):
binary_path = os.path.join( binary_path = os.path.join(
self.server['default_binary_paths'][self.server['type']], 'psql') self.server['default_binary_paths'][self.server['type']], 'psql')
if os.name == 'nt':
binary_path = binary_path + '.exe'
retVal = does_utility_exist(binary_path) retVal = does_utility_exist(binary_path)
if retVal is not None: if retVal is not None:
self.skipTest(retVal) self.skipTest(retVal)

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

@ -75,6 +75,10 @@ class RestoreJobTest(BaseTestGenerator):
binary_path = os.path.join( binary_path = os.path.join(
self.server['default_binary_paths'][self.server['type']], self.server['default_binary_paths'][self.server['type']],
'pg_restore') 'pg_restore')
if os.name == 'nt':
binary_path = binary_path + '.exe'
retVal = does_utility_exist(binary_path) retVal = does_utility_exist(binary_path)
if retVal is not None: if retVal is not None:
self.skipTest(retVal) self.skipTest(retVal)

4
web/pgadmin/tools/restore/tests/test_restore_create_job_unit_test.py
View File

@ -305,6 +305,10 @@ class RestoreCreateJobTest(BaseTestGenerator):
binary_path = os.path.join( binary_path = os.path.join(
self.server['default_binary_paths'][self.server['type']], self.server['default_binary_paths'][self.server['type']],
'pg_restore') 'pg_restore')
if os.name == 'nt':
binary_path = binary_path + '.exe'
retVal = does_utility_exist(binary_path) retVal = does_utility_exist(binary_path)
if retVal is not None: if retVal is not None:
self.skipTest(retVal) self.skipTest(retVal)