Rename horribly named function.

This commit is contained in:
Dave Page
2019-07-12 13:00:23 +01:00
parent ce8a2bb266
commit 3f4d5a687b
16 changed files with 39 additions and 39 deletions

View File

@@ -32,9 +32,9 @@ class TestUtilityCheckRouteCase(BaseTestGenerator):
def setUp(self):
check_binary_path_or_skip_test(self, 'pg_restore')
@patch('pgadmin.tools.restore.is_utility_exists')
def runTest(self, is_utility_exists_mock):
is_utility_exists_mock.return_value = False
@patch('pgadmin.tools.restore.does_utility_exist')
def runTest(self, does_utility_exist_mock):
does_utility_exist_mock.return_value = False
server_id = self.server_information['server_id']
response = self.tester.get(self.url.format(server_id))
self.assertEquals(response.status_code, 200)

View File

@@ -17,7 +17,7 @@ import simplejson as json
from pgadmin.utils.route import BaseTestGenerator
from regression import parent_node_dict
from regression.python_test_utils import test_utils as utils
from pgadmin.utils import server_utils as server_utils, is_utility_exists
from pgadmin.utils import server_utils as server_utils, does_utility_exist
import pgadmin.tools.backup.tests.test_backup_utils as backup_utils
@@ -75,7 +75,7 @@ class RestoreJobTest(BaseTestGenerator):
binary_path = os.path.join(
self.server['default_binary_paths'][self.server['type']],
'pg_restore')
retVal = is_utility_exists(binary_path)
retVal = does_utility_exist(binary_path)
if retVal is not None:
self.skipTest(retVal)

View File

@@ -13,7 +13,7 @@ import os
from pgadmin.utils.route import BaseTestGenerator
from regression import parent_node_dict
from pgadmin.utils import server_utils as server_utils, is_utility_exists
from pgadmin.utils import server_utils as server_utils, does_utility_exist
from pgadmin.browser.server_groups.servers.databases.tests import utils as \
database_utils
@@ -305,7 +305,7 @@ class RestoreCreateJobTest(BaseTestGenerator):
binary_path = os.path.join(
self.server['default_binary_paths'][self.server['type']],
'pg_restore')
retVal = is_utility_exists(binary_path)
retVal = does_utility_exist(binary_path)
if retVal is not None:
self.skipTest(retVal)