From 860ab797a8bad2e5770627511815d4ef9cc706e4 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Mon, 19 Sep 2022 18:34:19 -0400 Subject: [PATCH] Remove a couple functions from test_db_util that talk to the Galaxy database directly. These functions were just effectively ensuring a Galaxy user was created properly - but the framework does that and the UI login double does that. --- lib/tool_shed/test/base/test_db_util.py | 11 ----------- .../functional/test_1000_install_basic_repository.py | 5 ----- ..._1010_install_repository_with_tool_dependencies.py | 3 --- ...install_repository_with_repository_dependencies.py | 5 ----- ...30_install_repository_with_dependency_revisions.py | 5 ----- .../test/functional/test_1070_invalid_tool.py | 5 ----- ..._1080_advanced_circular_dependency_installation.py | 5 ----- .../test_1090_repository_dependency_handling.py | 5 ----- ...st_1100_install_updated_repository_dependencies.py | 5 ----- .../test_1170_prior_installation_required.py | 5 ----- .../test_1180_circular_prior_installation_required.py | 5 ----- ...t_1200_uninstall_and_reinstall_basic_repository.py | 5 ----- ...all_reinstall_repository_with_tool_dependencies.py | 3 --- ..._reinstall_repository_with_dependency_revisions.py | 3 --- .../test/functional/test_1410_update_manager.py | 5 ----- 15 files changed, 75 deletions(-) diff --git a/lib/tool_shed/test/base/test_db_util.py b/lib/tool_shed/test/base/test_db_util.py index bb758d56d3b..3bd2ec9b56a 100644 --- a/lib/tool_shed/test/base/test_db_util.py +++ b/lib/tool_shed/test/base/test_db_util.py @@ -192,17 +192,6 @@ def ga_refresh(obj): install_session.refresh(obj) -def get_galaxy_private_role(user): - for role in user.all_roles(): - if role.name == user.email and role.description == f"Private Role for {user.email}": - return role - raise AssertionError(f"Private role not found for user '{user.email}'") - - -def get_galaxy_user(email): - return ga_session.query(galaxy.model.User).filter(galaxy.model.User.table.c.email == email).first() - - def get_repository_by_name_and_owner(name, owner_username, return_multiple=False): owner = get_user_by_name(owner_username) repository = ( diff --git a/lib/tool_shed/test/functional/test_1000_install_basic_repository.py b/lib/tool_shed/test/functional/test_1000_install_basic_repository.py index 2fd978971e0..6eb044e84ec 100644 --- a/lib/tool_shed/test/functional/test_1000_install_basic_repository.py +++ b/lib/tool_shed/test/functional/test_1000_install_basic_repository.py @@ -20,11 +20,6 @@ class BasicToolShedFeatures(ShedTwillTestCase): assert admin_user is not None, f"Problem retrieving user with email {common.admin_email} from the database" self.test_db_util.get_private_role(admin_user) self.galaxy_login(email=common.admin_email, username=common.admin_username) - galaxy_admin_user = self.test_db_util.get_galaxy_user(common.admin_email) - assert ( - galaxy_admin_user is not None - ), f"Problem retrieving user with email {common.admin_email} from the database" - self.test_db_util.get_galaxy_private_role(galaxy_admin_user) def test_0005_ensure_repositories_and_categories_exist(self): """Create the 0000 category and upload the filtering repository to it, if necessary.""" diff --git a/lib/tool_shed/test/functional/test_1010_install_repository_with_tool_dependencies.py b/lib/tool_shed/test/functional/test_1010_install_repository_with_tool_dependencies.py index c7796fbafd3..6fa71b3c4e7 100644 --- a/lib/tool_shed/test/functional/test_1010_install_repository_with_tool_dependencies.py +++ b/lib/tool_shed/test/functional/test_1010_install_repository_with_tool_dependencies.py @@ -19,9 +19,6 @@ class ToolWithToolDependencies(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" self.galaxy_login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_galaxy_user(common.admin_email) - assert admin_user is not None, f"Problem retrieving user with email {common.admin_email} from the database" - self.test_db_util.get_galaxy_private_role(admin_user) self.login(email=common.test_user_1_email, username=common.test_user_1_name) test_user_1 = self.test_db_util.get_user(common.test_user_1_email) assert ( diff --git a/lib/tool_shed/test/functional/test_1020_install_repository_with_repository_dependencies.py b/lib/tool_shed/test/functional/test_1020_install_repository_with_repository_dependencies.py index 69dfd9beb21..3ffbbcbdb5c 100644 --- a/lib/tool_shed/test/functional/test_1020_install_repository_with_repository_dependencies.py +++ b/lib/tool_shed/test/functional/test_1020_install_repository_with_repository_dependencies.py @@ -28,11 +28,6 @@ class ToolWithRepositoryDependencies(ShedTwillTestCase): assert admin_user is not None, f"Problem retrieving user with email {common.admin_email} from the database" self.test_db_util.get_private_role(admin_user) self.galaxy_login(email=common.admin_email, username=common.admin_username) - galaxy_admin_user = self.test_db_util.get_galaxy_user(common.admin_email) - assert ( - galaxy_admin_user is not None - ), f"Problem retrieving user with email {common.admin_email} from the database" - self.test_db_util.get_galaxy_private_role(galaxy_admin_user) def test_0005_ensure_repositories_and_categories_exist(self): """Create the 0020 category and any missing repositories.""" diff --git a/lib/tool_shed/test/functional/test_1030_install_repository_with_dependency_revisions.py b/lib/tool_shed/test/functional/test_1030_install_repository_with_dependency_revisions.py index 99bd0db4e28..96ce478c2fc 100644 --- a/lib/tool_shed/test/functional/test_1030_install_repository_with_dependency_revisions.py +++ b/lib/tool_shed/test/functional/test_1030_install_repository_with_dependency_revisions.py @@ -32,11 +32,6 @@ class RepositoryWithDependencyRevisions(ShedTwillTestCase): assert admin_user is not None, f"Problem retrieving user with email {common.admin_email} from the database" self.test_db_util.get_private_role(admin_user) self.galaxy_login(email=common.admin_email, username=common.admin_username) - galaxy_admin_user = self.test_db_util.get_galaxy_user(common.admin_email) - assert ( - galaxy_admin_user is not None - ), f"Problem retrieving user with email {common.admin_email} from the database" - self.test_db_util.get_galaxy_private_role(galaxy_admin_user) def test_0005_ensure_repositories_and_categories_exist(self): """Create the 0030 category and add repositories to it, if necessary.""" diff --git a/lib/tool_shed/test/functional/test_1070_invalid_tool.py b/lib/tool_shed/test/functional/test_1070_invalid_tool.py index 0059ac752d8..524047b499f 100644 --- a/lib/tool_shed/test/functional/test_1070_invalid_tool.py +++ b/lib/tool_shed/test/functional/test_1070_invalid_tool.py @@ -16,11 +16,6 @@ class TestFreebayesRepository(ShedTwillTestCase): def test_0000_create_or_login_admin_user(self): """Create necessary user accounts and login as an admin user.""" self.galaxy_login(email=common.admin_email, username=common.admin_username) - galaxy_admin_user = self.test_db_util.get_galaxy_user(common.admin_email) - assert ( - galaxy_admin_user is not None - ), f"Problem retrieving user with email {common.admin_email} from the database" - self.test_db_util.get_galaxy_private_role(galaxy_admin_user) self.login(email=common.test_user_1_email, username=common.test_user_1_name) test_user_1 = self.test_db_util.get_user(common.test_user_1_email) assert ( diff --git a/lib/tool_shed/test/functional/test_1080_advanced_circular_dependency_installation.py b/lib/tool_shed/test/functional/test_1080_advanced_circular_dependency_installation.py index de559348e5c..5842e81ff88 100644 --- a/lib/tool_shed/test/functional/test_1080_advanced_circular_dependency_installation.py +++ b/lib/tool_shed/test/functional/test_1080_advanced_circular_dependency_installation.py @@ -27,11 +27,6 @@ class TestRepositoryDependencies(ShedTwillTestCase): def test_0000_create_or_login_admin_user(self): """Create necessary user accounts and login as an admin user.""" self.galaxy_login(email=common.admin_email, username=common.admin_username) - galaxy_admin_user = self.test_db_util.get_galaxy_user(common.admin_email) - assert ( - galaxy_admin_user is not None - ), f"Problem retrieving user with email {common.admin_email} from the database" - self.test_db_util.get_galaxy_private_role(galaxy_admin_user) self.login(email=common.test_user_1_email, username=common.test_user_1_name) test_user_1 = self.test_db_util.get_user(common.test_user_1_email) assert ( diff --git a/lib/tool_shed/test/functional/test_1090_repository_dependency_handling.py b/lib/tool_shed/test/functional/test_1090_repository_dependency_handling.py index 71ed5b316e6..70ac52b6a03 100644 --- a/lib/tool_shed/test/functional/test_1090_repository_dependency_handling.py +++ b/lib/tool_shed/test/functional/test_1090_repository_dependency_handling.py @@ -25,11 +25,6 @@ class TestRepositoryDependencies(ShedTwillTestCase): def test_0000_create_or_login_admin_user(self): """Create necessary user accounts and login as an admin user.""" self.galaxy_login(email=common.admin_email, username=common.admin_username) - galaxy_admin_user = self.test_db_util.get_galaxy_user(common.admin_email) - assert ( - galaxy_admin_user is not None - ), f"Problem retrieving user with email {common.admin_email} from the database" - self.test_db_util.get_galaxy_private_role(galaxy_admin_user) self.login(email=common.test_user_1_email, username=common.test_user_1_name) test_user_1 = self.test_db_util.get_user(common.test_user_1_email) assert ( diff --git a/lib/tool_shed/test/functional/test_1100_install_updated_repository_dependencies.py b/lib/tool_shed/test/functional/test_1100_install_updated_repository_dependencies.py index c35e25fdca8..7eac46d5e7b 100644 --- a/lib/tool_shed/test/functional/test_1100_install_updated_repository_dependencies.py +++ b/lib/tool_shed/test/functional/test_1100_install_updated_repository_dependencies.py @@ -21,11 +21,6 @@ class TestRepositoryDependencies(ShedTwillTestCase): def test_0000_create_or_login_admin_user(self): """Create necessary user accounts and login as an admin user.""" self.galaxy_login(email=common.admin_email, username=common.admin_username) - galaxy_admin_user = self.test_db_util.get_galaxy_user(common.admin_email) - assert ( - galaxy_admin_user is not None - ), f"Problem retrieving user with email {common.admin_email} from the database" - self.test_db_util.get_galaxy_private_role(galaxy_admin_user) self.login(email=common.test_user_1_email, username=common.test_user_1_name) test_user_1 = self.test_db_util.get_user(common.test_user_1_email) assert ( diff --git a/lib/tool_shed/test/functional/test_1170_prior_installation_required.py b/lib/tool_shed/test/functional/test_1170_prior_installation_required.py index fd884346197..266c59ddcda 100644 --- a/lib/tool_shed/test/functional/test_1170_prior_installation_required.py +++ b/lib/tool_shed/test/functional/test_1170_prior_installation_required.py @@ -41,11 +41,6 @@ class TestSimplePriorInstallation(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" self.galaxy_login(email=common.admin_email, username=common.admin_username) - galaxy_admin_user = self.test_db_util.get_galaxy_user(common.admin_email) - assert ( - galaxy_admin_user is not None - ), f"Problem retrieving user with email {common.admin_email} from the database" - self.test_db_util.get_galaxy_private_role(galaxy_admin_user) self.login(email=common.test_user_1_email, username=common.test_user_1_name) test_user_1 = self.test_db_util.get_user(common.test_user_1_email) assert ( diff --git a/lib/tool_shed/test/functional/test_1180_circular_prior_installation_required.py b/lib/tool_shed/test/functional/test_1180_circular_prior_installation_required.py index 43d77d148b8..20f92c9227a 100644 --- a/lib/tool_shed/test/functional/test_1180_circular_prior_installation_required.py +++ b/lib/tool_shed/test/functional/test_1180_circular_prior_installation_required.py @@ -54,11 +54,6 @@ class TestSimplePriorInstallation(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" self.galaxy_login(email=common.admin_email, username=common.admin_username) - galaxy_admin_user = self.test_db_util.get_galaxy_user(common.admin_email) - assert ( - galaxy_admin_user is not None - ), f"Problem retrieving user with email {common.admin_email} from the database" - self.test_db_util.get_galaxy_private_role(galaxy_admin_user) self.login(email=common.test_user_1_email, username=common.test_user_1_name) test_user_1 = self.test_db_util.get_user(common.test_user_1_email) assert ( diff --git a/lib/tool_shed/test/functional/test_1200_uninstall_and_reinstall_basic_repository.py b/lib/tool_shed/test/functional/test_1200_uninstall_and_reinstall_basic_repository.py index 4f0c450ab0b..c9866871627 100644 --- a/lib/tool_shed/test/functional/test_1200_uninstall_and_reinstall_basic_repository.py +++ b/lib/tool_shed/test/functional/test_1200_uninstall_and_reinstall_basic_repository.py @@ -20,11 +20,6 @@ class UninstallingAndReinstallingRepositories(ShedTwillTestCase): assert admin_user is not None, f"Problem retrieving user with email {common.admin_email} from the database" self.test_db_util.get_private_role(admin_user) self.galaxy_login(email=common.admin_email, username=common.admin_username) - galaxy_admin_user = self.test_db_util.get_galaxy_user(common.admin_email) - assert ( - galaxy_admin_user is not None - ), f"Problem retrieving user with email {common.admin_email} from the database" - self.test_db_util.get_galaxy_private_role(galaxy_admin_user) def test_0005_ensure_repositories_and_categories_exist(self): """Create the 0000 category and upload the filtering repository to the tool shed, if necessary.""" diff --git a/lib/tool_shed/test/functional/test_1210_uninstall_reinstall_repository_with_tool_dependencies.py b/lib/tool_shed/test/functional/test_1210_uninstall_reinstall_repository_with_tool_dependencies.py index 7676db9eb55..52b1670a1e0 100644 --- a/lib/tool_shed/test/functional/test_1210_uninstall_reinstall_repository_with_tool_dependencies.py +++ b/lib/tool_shed/test/functional/test_1210_uninstall_reinstall_repository_with_tool_dependencies.py @@ -12,9 +12,6 @@ class UninstallingAndReinstallingRepositories(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" self.galaxy_login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_galaxy_user(common.admin_email) - assert admin_user is not None, f"Problem retrieving user with email {common.admin_email} from the database" - self.test_db_util.get_galaxy_private_role(admin_user) self.login(email=common.test_user_1_email, username=common.test_user_1_name) test_user_1 = self.test_db_util.get_user(common.test_user_1_email) assert ( diff --git a/lib/tool_shed/test/functional/test_1230_uninstall_reinstall_repository_with_dependency_revisions.py b/lib/tool_shed/test/functional/test_1230_uninstall_reinstall_repository_with_dependency_revisions.py index 037fda8ff5d..0ba69beee96 100644 --- a/lib/tool_shed/test/functional/test_1230_uninstall_reinstall_repository_with_dependency_revisions.py +++ b/lib/tool_shed/test/functional/test_1230_uninstall_reinstall_repository_with_dependency_revisions.py @@ -22,9 +22,6 @@ class UninstallingAndReinstallingRepositories(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" self.galaxy_login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_galaxy_user(common.admin_email) - assert admin_user is not None, f"Problem retrieving user with email {common.admin_email} from the database" - self.test_db_util.get_galaxy_private_role(admin_user) self.login(email=common.test_user_1_email, username=common.test_user_1_name) test_user_1 = self.test_db_util.get_user(common.test_user_1_email) assert ( diff --git a/lib/tool_shed/test/functional/test_1410_update_manager.py b/lib/tool_shed/test/functional/test_1410_update_manager.py index b64d8b9044b..af6f2b8bbfa 100644 --- a/lib/tool_shed/test/functional/test_1410_update_manager.py +++ b/lib/tool_shed/test/functional/test_1410_update_manager.py @@ -43,11 +43,6 @@ class TestUpdateManager(ShedTwillTestCase): assert admin_user is not None, f"Problem retrieving user with email {common.admin_email} from the database" self.test_db_util.get_private_role(admin_user) self.galaxy_login(email=common.admin_email, username=common.admin_username) - galaxy_admin_user = self.test_db_util.get_galaxy_user(common.admin_email) - assert ( - galaxy_admin_user is not None - ), f"Problem retrieving user with email {common.admin_email} from the database" - self.test_db_util.get_galaxy_private_role(galaxy_admin_user) def test_0005_create_filtering_repository(self): """Create and populate the filtering_1410 repository.