opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove a couple functions from test_db_util that talk to the Galaxy database directly.

Browse Source 
These functions were just effectively ensuring a Galaxy user was created properly - but the framework does that and the UI login double does that.
This commit is contained in:
John Chilton
2022-09-20 18:25:47 -04:00
parent 8134c58f35
commit 860ab797a8
15 changed files with 0 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tool_shed/test/base/test_db_util.py
-11
View File
@@ -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 = (
lib/tool_shed/test/functional/test_1000_install_basic_repository.py
-5
View File
@@ -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."""
lib/tool_shed/test/functional/test_1010_install_repository_with_tool_dependencies.py
-3
View File
@@ -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 (
lib/tool_shed/test/functional/test_1020_install_repository_with_repository_dependencies.py
-5
View File
@@ -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."""
lib/tool_shed/test/functional/test_1030_install_repository_with_dependency_revisions.py
-5
View File
@@ -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."""
lib/tool_shed/test/functional/test_1070_invalid_tool.py
-5
View File
@@ -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 (
lib/tool_shed/test/functional/test_1080_advanced_circular_dependency_installation.py
-5
View File
@@ -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 (
lib/tool_shed/test/functional/test_1090_repository_dependency_handling.py
-5
View File
@@ -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 (
lib/tool_shed/test/functional/test_1100_install_updated_repository_dependencies.py
-5
View File
@@ -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 (
lib/tool_shed/test/functional/test_1170_prior_installation_required.py
-5
View File
@@ -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 (
lib/tool_shed/test/functional/test_1180_circular_prior_installation_required.py
-5
View File
@@ -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 (
lib/tool_shed/test/functional/test_1200_uninstall_and_reinstall_basic_repository.py
-5
View File
@@ -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."""
lib/tool_shed/test/functional/test_1210_uninstall_reinstall_repository_with_tool_dependencies.py
-3
View File
@@ -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 (
lib/tool_shed/test/functional/test_1230_uninstall_reinstall_repository_with_dependency_revisions.py
-3
View File
@@ -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 (
lib/tool_shed/test/functional/test_1410_update_manager.py
-5
View File
@@ -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.