From 2058cdf662f88d04039a88e5635379f31bb7d971 Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Mon, 22 Oct 2018 13:22:35 +0530
Subject: [PATCH] Fixed test cases for Utilities when default_binary_path is
 not provided in test_config file.

---
 .../tools/backup/tests/test_backup_create_job_unit_test.py       | 1 +
 web/pgadmin/tools/backup/tests/test_create_backup_job.py         | 1 +
 .../tools/maintenance/tests/test_create_maintenance_job.py       | 1 +
 .../maintenance/tests/test_maintenance_create_job_unit_test.py   | 1 +
 web/pgadmin/tools/restore/tests/test_create_restore_job.py       | 1 +
 .../tools/restore/tests/test_restore_create_job_unit_test.py     | 1 +
 6 files changed, 6 insertions(+)

diff --git a/web/pgadmin/tools/backup/tests/test_backup_create_job_unit_test.py b/web/pgadmin/tools/backup/tests/test_backup_create_job_unit_test.py
index 4897e1e03..a3f3874ac 100644
--- a/web/pgadmin/tools/backup/tests/test_backup_create_job_unit_test.py
+++ b/web/pgadmin/tools/backup/tests/test_backup_create_job_unit_test.py
@@ -641,6 +641,7 @@ class BackupCreateJobTest(BaseTestGenerator):
 
     def setUp(self):
         if 'default_binary_paths' not in self.server or \
+            self.server['default_binary_paths'] is None or \
             self.server['type'] not in self.server['default_binary_paths'] or \
                 self.server['default_binary_paths'][self.server['type']] == '':
             self.skipTest(
diff --git a/web/pgadmin/tools/backup/tests/test_create_backup_job.py b/web/pgadmin/tools/backup/tests/test_create_backup_job.py
index 3f6a6de5f..87f313fb9 100644
--- a/web/pgadmin/tools/backup/tests/test_create_backup_job.py
+++ b/web/pgadmin/tools/backup/tests/test_create_backup_job.py
@@ -40,6 +40,7 @@ class BackupJobTest(BaseTestGenerator):
 
     def setUp(self):
         if 'default_binary_paths' not in self.server or \
+            self.server['default_binary_paths'] is None or \
             self.server['type'] not in self.server['default_binary_paths'] or\
                 self.server['default_binary_paths'][self.server['type']] == '':
             self.skipTest(
diff --git a/web/pgadmin/tools/maintenance/tests/test_create_maintenance_job.py b/web/pgadmin/tools/maintenance/tests/test_create_maintenance_job.py
index 457b72feb..276226783 100644
--- a/web/pgadmin/tools/maintenance/tests/test_create_maintenance_job.py
+++ b/web/pgadmin/tools/maintenance/tests/test_create_maintenance_job.py
@@ -41,6 +41,7 @@ class MaintenanceJobTest(BaseTestGenerator):
 
     def setUp(self):
         if 'default_binary_paths' not in self.server or \
+            self.server['default_binary_paths'] is None or \
             self.server['type'] not in self.server['default_binary_paths'] or\
                 self.server['default_binary_paths'][self.server['type']] == '':
             self.skipTest(
diff --git a/web/pgadmin/tools/maintenance/tests/test_maintenance_create_job_unit_test.py b/web/pgadmin/tools/maintenance/tests/test_maintenance_create_job_unit_test.py
index f4eb55189..62fc523ec 100644
--- a/web/pgadmin/tools/maintenance/tests/test_maintenance_create_job_unit_test.py
+++ b/web/pgadmin/tools/maintenance/tests/test_maintenance_create_job_unit_test.py
@@ -130,6 +130,7 @@ class MaintenanceCreateJobTest(BaseTestGenerator):
 
     def setUp(self):
         if 'default_binary_paths' not in self.server or \
+            self.server['default_binary_paths'] is None or \
             self.server['type'] not in self.server['default_binary_paths'] or\
                 self.server['default_binary_paths'][self.server['type']] == '':
             self.skipTest(
diff --git a/web/pgadmin/tools/restore/tests/test_create_restore_job.py b/web/pgadmin/tools/restore/tests/test_create_restore_job.py
index b0f988be2..48798082d 100644
--- a/web/pgadmin/tools/restore/tests/test_create_restore_job.py
+++ b/web/pgadmin/tools/restore/tests/test_create_restore_job.py
@@ -63,6 +63,7 @@ class RestoreJobTest(BaseTestGenerator):
 
     def setUp(self):
         if 'default_binary_paths' not in self.server or \
+            self.server['default_binary_paths'] is None or \
             self.server['type'] not in self.server['default_binary_paths'] or\
                 self.server['default_binary_paths'][self.server['type']] == '':
             self.skipTest(
diff --git a/web/pgadmin/tools/restore/tests/test_restore_create_job_unit_test.py b/web/pgadmin/tools/restore/tests/test_restore_create_job_unit_test.py
index ffed47145..ab0624bd5 100644
--- a/web/pgadmin/tools/restore/tests/test_restore_create_job_unit_test.py
+++ b/web/pgadmin/tools/restore/tests/test_restore_create_job_unit_test.py
@@ -293,6 +293,7 @@ class RestoreCreateJobTest(BaseTestGenerator):
 
     def setUp(self):
         if 'default_binary_paths' not in self.server or \
+            self.server['default_binary_paths'] is None or \
             self.server['type'] not in self.server['default_binary_paths'] or\
                 self.server['default_binary_paths'][self.server['type']] == '':
             self.skipTest(