From 45d0f161c92c6fdac103ca3eecec421ac3fa3db3 Mon Sep 17 00:00:00 2001 From: Sebastian Kapust Date: Sat, 3 Nov 2018 14:11:43 +0100 Subject: [PATCH] Fix functional test case test_1460_data_managers --- test/shed_functional/base/twilltestcase.py | 4 ++-- test/shed_functional/functional/test_1460_data_managers.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/shed_functional/base/twilltestcase.py b/test/shed_functional/base/twilltestcase.py index 0e00e0ff9fcb..0e872c5cf4d0 100644 --- a/test/shed_functional/base/twilltestcase.py +++ b/test/shed_functional/base/twilltestcase.py @@ -863,7 +863,7 @@ def display_galaxy_browse_repositories_page(self, strings_displayed=None, string self.visit_galaxy_url(url) self.check_for_strings(strings_displayed, strings_not_displayed) - def display_installed_manage_data_manager_page(self, installed_repository, data_manager_names=None, strings_displayed=None, strings_not_displayed=None): + def display_installed_jobs_list_page(self, installed_repository, data_manager_names=None, strings_displayed=None, strings_not_displayed=None): data_managers = installed_repository.metadata.get('data_manager', {}).get('data_managers', {}) if data_manager_names: if not isinstance(data_manager_names, list): @@ -876,7 +876,7 @@ def display_installed_manage_data_manager_page(self, installed_repository, data_ params = { 'id': data_managers[data_manager_name]['guid'] } - self.visit_galaxy_url('/data_manager/manage_data_manager', params=params) + self.visit_galaxy_url('/data_manager/jobs_list', params=params) self.check_for_strings(strings_displayed, strings_not_displayed) def display_installed_repository_manage_page(self, installed_repository, strings_displayed=None, strings_not_displayed=None): diff --git a/test/shed_functional/functional/test_1460_data_managers.py b/test/shed_functional/functional/test_1460_data_managers.py index d961117c1a2f..268c5f32732a 100644 --- a/test/shed_functional/functional/test_1460_data_managers.py +++ b/test/shed_functional/functional/test_1460_data_managers.py @@ -84,8 +84,8 @@ def test_0020_install_data_manager_repository(self): def test_0030_verify_data_manager_tool(self): '''Verify that the data_manager_1460 repository is installed and Data Manager tool appears in list in Galaxy.''' repository = self.test_db_util.get_installed_repository_by_name_owner(data_manager_repository_name, common.test_user_1_name) - strings_displayed = ['Access managed data by job'] - self.display_installed_manage_data_manager_page(repository, data_manager_names=data_manager_name, strings_displayed=strings_displayed) + strings_displayed = ['status', 'jobs', data_manager_name] + self.display_installed_jobs_list_page(repository, data_manager_names=data_manager_name, strings_displayed=strings_displayed) def test_0040_verify_data_manager_data_table(self): '''Verify that the installed repository populated shed_tool_data_table.xml and the sample files.'''