diff --git a/lib/tool_shed/test/base/test_db_util.py b/lib/tool_shed/test/base/test_db_util.py index 01eaac9663e..e219f2c5939 100644 --- a/lib/tool_shed/test/base/test_db_util.py +++ b/lib/tool_shed/test/base/test_db_util.py @@ -90,13 +90,6 @@ def get_installed_repository_by_name_owner(repository_name, owner, return_multip return query.first() -def get_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_role(user, role_name): for role in user.all_roles(): if role.name == role_name: diff --git a/lib/tool_shed/test/functional/test_0000_basic_repository_features.py b/lib/tool_shed/test/functional/test_0000_basic_repository_features.py index dbb5552c7a1..9b632b11fc7 100644 --- a/lib/tool_shed/test/functional/test_0000_basic_repository_features.py +++ b/lib/tool_shed/test/functional/test_0000_basic_repository_features.py @@ -18,21 +18,8 @@ class TestBasicRepositoryFeatures(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts and login as an 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.test_user_2_email, username=common.test_user_2_name) - test_user_2 = self.test_db_util.get_user(common.test_user_2_email) - assert ( - test_user_2 is not None - ), f"Problem retrieving user with email {common.test_user_2_email} from the database" - self.test_db_util.get_private_role(test_user_2) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_repository_without_categories(self): """Verify that a repository cannot be created unless at least one category has been defined.""" diff --git a/lib/tool_shed/test/functional/test_0010_repository_with_tool_dependencies.py b/lib/tool_shed/test/functional/test_0010_repository_with_tool_dependencies.py index ab62120ceb5..f0c7c820df8 100644 --- a/lib/tool_shed/test/functional/test_0010_repository_with_tool_dependencies.py +++ b/lib/tool_shed/test/functional/test_0010_repository_with_tool_dependencies.py @@ -26,15 +26,7 @@ class TestFreebayesRepository(ShedTwillTestCase): def test_0000_create_or_login_admin_user(self): """Create necessary user accounts and login as an 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_category(self): """Create a category for this test suite""" diff --git a/lib/tool_shed/test/functional/test_0020_basic_repository_dependencies.py b/lib/tool_shed/test/functional/test_0020_basic_repository_dependencies.py index 4d32c6955ab..769d2704cf4 100644 --- a/lib/tool_shed/test/functional/test_0020_basic_repository_dependencies.py +++ b/lib/tool_shed/test/functional/test_0020_basic_repository_dependencies.py @@ -18,15 +18,7 @@ class TestBasicRepositoryDependencies(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts and login as an 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_category(self): """Create a category for this test suite""" diff --git a/lib/tool_shed/test/functional/test_0030_repository_dependency_revisions.py b/lib/tool_shed/test/functional/test_0030_repository_dependency_revisions.py index 4c6df862180..6389b4c3c20 100644 --- a/lib/tool_shed/test/functional/test_0030_repository_dependency_revisions.py +++ b/lib/tool_shed/test/functional/test_0030_repository_dependency_revisions.py @@ -20,15 +20,7 @@ class TestRepositoryDependencyRevisions(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_category(self): """Create a category for this test suite""" diff --git a/lib/tool_shed/test/functional/test_0040_repository_circular_dependencies.py b/lib/tool_shed/test/functional/test_0040_repository_circular_dependencies.py index b846ce5e77b..7f47b7ee754 100644 --- a/lib/tool_shed/test/functional/test_0040_repository_circular_dependencies.py +++ b/lib/tool_shed/test/functional/test_0040_repository_circular_dependencies.py @@ -21,15 +21,7 @@ class TestRepositoryCircularDependencies(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_category(self): """Create a category for this test suite""" diff --git a/lib/tool_shed/test/functional/test_0050_circular_dependencies_4_levels.py b/lib/tool_shed/test/functional/test_0050_circular_dependencies_4_levels.py index 3edca69132a..1ec35851ba0 100644 --- a/lib/tool_shed/test/functional/test_0050_circular_dependencies_4_levels.py +++ b/lib/tool_shed/test/functional/test_0050_circular_dependencies_4_levels.py @@ -37,15 +37,7 @@ class TestRepositoryCircularDependenciesToNLevels(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_convert_repository(self): """Create and populate convert_chars_0050.""" diff --git a/lib/tool_shed/test/functional/test_0070_invalid_tool.py b/lib/tool_shed/test/functional/test_0070_invalid_tool.py index b8e6f6621a7..547433099d2 100644 --- a/lib/tool_shed/test/functional/test_0070_invalid_tool.py +++ b/lib/tool_shed/test/functional/test_0070_invalid_tool.py @@ -16,15 +16,7 @@ class TestBismarkRepository(ShedTwillTestCase): def test_0000_create_or_login_admin_user(self): """Create necessary user accounts and login as an 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_category_and_repository(self): """Create a category for this test suite, then create and populate a bismark repository. It should contain at least one each valid and invalid tool.""" diff --git a/lib/tool_shed/test/functional/test_0080_advanced_circular_dependencies.py b/lib/tool_shed/test/functional/test_0080_advanced_circular_dependencies.py index e20de949cec..5c2674f0936 100644 --- a/lib/tool_shed/test/functional/test_0080_advanced_circular_dependencies.py +++ b/lib/tool_shed/test/functional/test_0080_advanced_circular_dependencies.py @@ -21,15 +21,7 @@ class TestRepositoryCircularDependencies(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_column_repository(self): """Create and populate the column_maker repository.""" diff --git a/lib/tool_shed/test/functional/test_0090_tool_search.py b/lib/tool_shed/test/functional/test_0090_tool_search.py index 90869bd82af..1d9a9221c26 100644 --- a/lib/tool_shed/test/functional/test_0090_tool_search.py +++ b/lib/tool_shed/test/functional/test_0090_tool_search.py @@ -33,15 +33,7 @@ class TestRepositoryCircularDependenciesAgain(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_bwa_base_repository(self): """Create and populate bwa_base_0090.""" diff --git a/lib/tool_shed/test/functional/test_0100_complex_repository_dependencies.py b/lib/tool_shed/test/functional/test_0100_complex_repository_dependencies.py index 5a660317a33..2723595c5c1 100644 --- a/lib/tool_shed/test/functional/test_0100_complex_repository_dependencies.py +++ b/lib/tool_shed/test/functional/test_0100_complex_repository_dependencies.py @@ -28,15 +28,7 @@ class TestComplexRepositoryDependencies(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_bwa_package_repository(self): """Create and populate package_bwa_0_5_9_0100.""" diff --git a/lib/tool_shed/test/functional/test_0110_invalid_simple_repository_dependencies.py b/lib/tool_shed/test/functional/test_0110_invalid_simple_repository_dependencies.py index 47a6feaa251..44165cfe410 100644 --- a/lib/tool_shed/test/functional/test_0110_invalid_simple_repository_dependencies.py +++ b/lib/tool_shed/test/functional/test_0110_invalid_simple_repository_dependencies.py @@ -21,15 +21,7 @@ class TestBasicRepositoryDependencies(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts and login as an 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_category(self): """Create a category for this test suite""" diff --git a/lib/tool_shed/test/functional/test_0120_simple_repository_dependency_multiple_owners.py b/lib/tool_shed/test/functional/test_0120_simple_repository_dependency_multiple_owners.py index f135b8f1f75..8daa7050143 100644 --- a/lib/tool_shed/test/functional/test_0120_simple_repository_dependency_multiple_owners.py +++ b/lib/tool_shed/test/functional/test_0120_simple_repository_dependency_multiple_owners.py @@ -31,21 +31,8 @@ class TestRepositoryMultipleOwners(ShedTwillTestCase): Previously created accounts will not be re-created. """ 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.test_user_2_email, username=common.test_user_2_name) - test_user_2 = self.test_db_util.get_user(common.test_user_1_email) - assert ( - test_user_2 is not None - ), f"Problem retrieving user with email {common.test_user_2_email} from the database" - self.test_db_util.get_private_role(test_user_2) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_datatypes_repository(self): """Create and populate the blast_datatypes_0120 repository diff --git a/lib/tool_shed/test/functional/test_0140_tool_help_images.py b/lib/tool_shed/test/functional/test_0140_tool_help_images.py index 9e634194813..62ad565119a 100644 --- a/lib/tool_shed/test/functional/test_0140_tool_help_images.py +++ b/lib/tool_shed/test/functional/test_0140_tool_help_images.py @@ -30,15 +30,7 @@ class TestToolHelpImages(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_htseq_count_repository(self): """Create and populate htseq_count_0140. diff --git a/lib/tool_shed/test/functional/test_0150_prior_installation_required.py b/lib/tool_shed/test/functional/test_0150_prior_installation_required.py index c5dea295a88..7b9869c65cd 100644 --- a/lib/tool_shed/test/functional/test_0150_prior_installation_required.py +++ b/lib/tool_shed/test/functional/test_0150_prior_installation_required.py @@ -35,15 +35,7 @@ class TestSimplePriorInstallation(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_convert_repository(self): """Create and populate convert_chars_0150.""" diff --git a/lib/tool_shed/test/functional/test_0160_circular_prior_installation_required.py b/lib/tool_shed/test/functional/test_0160_circular_prior_installation_required.py index b8c9c47dbc1..6b7a0e58592 100644 --- a/lib/tool_shed/test/functional/test_0160_circular_prior_installation_required.py +++ b/lib/tool_shed/test/functional/test_0160_circular_prior_installation_required.py @@ -34,15 +34,7 @@ class TestSimplePriorInstallation(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_convert_repository(self): """Create and populate convert_chars_0160.""" diff --git a/lib/tool_shed/test/functional/test_0170_complex_prior_installation_required.py b/lib/tool_shed/test/functional/test_0170_complex_prior_installation_required.py index 8b64a2ff8b6..f63d54fc55d 100644 --- a/lib/tool_shed/test/functional/test_0170_complex_prior_installation_required.py +++ b/lib/tool_shed/test/functional/test_0170_complex_prior_installation_required.py @@ -35,15 +35,7 @@ class TestComplexPriorInstallation(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_matplotlib_repository(self): """Create and populate the package_matplotlib_1_2_0170 repository. diff --git a/lib/tool_shed/test/functional/test_0300_reset_all_metadata.py b/lib/tool_shed/test/functional/test_0300_reset_all_metadata.py index 61c083f51bf..6bdc4fab6f3 100644 --- a/lib/tool_shed/test/functional/test_0300_reset_all_metadata.py +++ b/lib/tool_shed/test/functional/test_0300_reset_all_metadata.py @@ -46,15 +46,7 @@ class TestResetAllRepositoryMetadata(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_filtering_repository(self): """Create and populate the filtering_0000 repository.""" diff --git a/lib/tool_shed/test/functional/test_0310_hg_api_features.py b/lib/tool_shed/test/functional/test_0310_hg_api_features.py index f3f47b1f98c..7c8873c3605 100644 --- a/lib/tool_shed/test/functional/test_0310_hg_api_features.py +++ b/lib/tool_shed/test/functional/test_0310_hg_api_features.py @@ -27,21 +27,8 @@ class TestHgWebFeatures(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts and login as an 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.test_user_2_email, username=common.test_user_2_name) - test_user_2 = self.test_db_util.get_user(common.test_user_2_email) - assert ( - test_user_2 is not None - ), f"Problem retrieving user with email {common.test_user_2_email} from the database" - self.test_db_util.get_private_role(test_user_2) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_filtering_repository(self): """Create and populate the filtering_0310 repository. diff --git a/lib/tool_shed/test/functional/test_0420_citable_urls_for_repositories.py b/lib/tool_shed/test/functional/test_0420_citable_urls_for_repositories.py index 13720b7b562..014eb031d05 100644 --- a/lib/tool_shed/test/functional/test_0420_citable_urls_for_repositories.py +++ b/lib/tool_shed/test/functional/test_0420_citable_urls_for_repositories.py @@ -37,15 +37,7 @@ class TestRepositoryCitableURLs(ShedTwillTestCase): Previously created accounts will not be re-created. """ 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_repository(self): """Create and populate the filtering_0420 repository diff --git a/lib/tool_shed/test/functional/test_0430_browse_utilities.py b/lib/tool_shed/test/functional/test_0430_browse_utilities.py index 38c0c325cc2..e897ca6c38f 100644 --- a/lib/tool_shed/test/functional/test_0430_browse_utilities.py +++ b/lib/tool_shed/test/functional/test_0430_browse_utilities.py @@ -33,15 +33,7 @@ class TestToolShedBrowseUtilities(ShedTwillTestCase): Previously created accounts will not be re-created. """ 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0010_create_emboss_repository(self): """Create and populate the emboss_0430 repository diff --git a/lib/tool_shed/test/functional/test_0440_deleting_dependency_definitions.py b/lib/tool_shed/test/functional/test_0440_deleting_dependency_definitions.py index dcedf318fc7..b70f63f3ce9 100644 --- a/lib/tool_shed/test/functional/test_0440_deleting_dependency_definitions.py +++ b/lib/tool_shed/test/functional/test_0440_deleting_dependency_definitions.py @@ -61,15 +61,7 @@ class TestDeletedDependencies(ShedTwillTestCase): Previously created accounts will not be re-created. """ 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_column_maker_repository(self): """Create and populate a repository named column_maker_0440. diff --git a/lib/tool_shed/test/functional/test_0460_upload_to_repository.py b/lib/tool_shed/test/functional/test_0460_upload_to_repository.py index 80da7c5dd85..c27ede6ff3d 100644 --- a/lib/tool_shed/test/functional/test_0460_upload_to_repository.py +++ b/lib/tool_shed/test/functional/test_0460_upload_to_repository.py @@ -62,21 +62,8 @@ class TestAutomaticDependencyRevision(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts and login as an 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.test_user_2_email, username=common.test_user_2_name) - test_user_2 = self.test_db_util.get_user(common.test_user_2_email) - assert ( - test_user_2 is not None - ), f"Problem retrieving user with email {common.test_user_2_email} from the database" - self.test_db_util.get_private_role(test_user_2) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_datatypes_repository(self): """Create and populate the emboss_datatypes_0460 repository diff --git a/lib/tool_shed/test/functional/test_0470_tool_dependency_repository_type.py b/lib/tool_shed/test/functional/test_0470_tool_dependency_repository_type.py index 7b2f0461287..7fcaf6f3a99 100644 --- a/lib/tool_shed/test/functional/test_0470_tool_dependency_repository_type.py +++ b/lib/tool_shed/test/functional/test_0470_tool_dependency_repository_type.py @@ -68,22 +68,9 @@ class TestEnvironmentInheritance(ShedTwillTestCase): def test_0000_initiate_users_and_category(self): """Create necessary user accounts and login as an admin user.""" self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) self.create_category(name=category_name, description=category_description) self.login(email=common.test_user_2_email, username=common.test_user_2_name) - test_user_2 = self.test_db_util.get_user(common.test_user_2_email) - assert ( - test_user_2 is not None - ), f"Problem retrieving user with email {common.test_user_2_email} from the database" - self.test_db_util.get_private_role(test_user_2) 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) def test_0005_create_libx11_repository(self): """Create and populate package_x11_client_1_5_proto_7_0_0470. diff --git a/lib/tool_shed/test/functional/test_0480_tool_dependency_xml_verification.py b/lib/tool_shed/test/functional/test_0480_tool_dependency_xml_verification.py index 29126a54881..7cafb988070 100644 --- a/lib/tool_shed/test/functional/test_0480_tool_dependency_xml_verification.py +++ b/lib/tool_shed/test/functional/test_0480_tool_dependency_xml_verification.py @@ -28,22 +28,9 @@ class TestDependencyDefinitionValidation(ShedTwillTestCase): def test_0000_initiate_users_and_category(self): """Create necessary user accounts and login as an admin user.""" self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) self.create_category(name=category_name, description=category_description) self.login(email=common.test_user_2_email, username=common.test_user_2_name) - test_user_2 = self.test_db_util.get_user(common.test_user_2_email) - assert ( - test_user_2 is not None - ), f"Problem retrieving user with email {common.test_user_2_email} from the database" - self.test_db_util.get_private_role(test_user_2) 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) def test_0005_create_tool_dependency_repository(self): """Create and populate package_invalid_tool_dependency_xml_1_0_0. diff --git a/lib/tool_shed/test/functional/test_0530_repository_admin_feature.py b/lib/tool_shed/test/functional/test_0530_repository_admin_feature.py index 4045ff5295e..823a69bc4ee 100644 --- a/lib/tool_shed/test/functional/test_0530_repository_admin_feature.py +++ b/lib/tool_shed/test/functional/test_0530_repository_admin_feature.py @@ -39,21 +39,8 @@ class TestRepositoryAdminRole(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.test_user_2_email, username=common.test_user_2_name) - test_user_2 = self.test_db_util.get_user(common.test_user_2_email) - assert ( - test_user_2 is not None - ), f"Problem retrieving user with email {common.test_user_2_email} from the database" - self.test_db_util.get_private_role(test_user_2) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_filtering_repository(self): """Create and populate the filtering_0530 repository. diff --git a/lib/tool_shed/test/functional/test_0540_get_all_metadata_from_api.py b/lib/tool_shed/test/functional/test_0540_get_all_metadata_from_api.py index 803c27eeb52..277a6c05371 100644 --- a/lib/tool_shed/test/functional/test_0540_get_all_metadata_from_api.py +++ b/lib/tool_shed/test/functional/test_0540_get_all_metadata_from_api.py @@ -47,15 +47,7 @@ class TestGetAllMetadata(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_bwa_package_repository(self): """Create and populate package_bwa_0_5_9_0540.""" diff --git a/lib/tool_shed/test/functional/test_0550_metadata_updated_dependencies.py b/lib/tool_shed/test/functional/test_0550_metadata_updated_dependencies.py index 8c322ccc665..17c8b0ded21 100644 --- a/lib/tool_shed/test/functional/test_0550_metadata_updated_dependencies.py +++ b/lib/tool_shed/test/functional/test_0550_metadata_updated_dependencies.py @@ -51,15 +51,7 @@ class TestGetUpdatedMetadata(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_freebayes_repository(self): """Create and populate package_freebayes_0550.""" 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 6eb044e84ec..c6d08d0bbb7 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 @@ -10,15 +10,7 @@ class BasicToolShedFeatures(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) self.galaxy_login(email=common.admin_email, username=common.admin_username) def test_0005_ensure_repositories_and_categories_exist(self): 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 6fa71b3c4e7..3eb2154526a 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 @@ -20,15 +20,7 @@ class ToolWithToolDependencies(ShedTwillTestCase): """Create necessary user accounts.""" self.galaxy_login(email=common.admin_email, username=common.admin_username) 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_ensure_repositories_and_categories_exist(self): """Create the 0010 category and upload the freebayes repository to it, if necessary.""" 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 3ffbbcbdb5c..8bad1742afe 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 @@ -18,15 +18,7 @@ class ToolWithRepositoryDependencies(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) self.galaxy_login(email=common.admin_email, username=common.admin_username) def test_0005_ensure_repositories_and_categories_exist(self): 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 96ce478c2fc..ec269e6b44d 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 @@ -22,15 +22,7 @@ class RepositoryWithDependencyRevisions(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) self.galaxy_login(email=common.admin_email, username=common.admin_username) def test_0005_ensure_repositories_and_categories_exist(self): diff --git a/lib/tool_shed/test/functional/test_1040_install_repository_basic_circular_dependencies.py b/lib/tool_shed/test/functional/test_1040_install_repository_basic_circular_dependencies.py index 8a7ba644c2d..165bddcfe05 100644 --- a/lib/tool_shed/test/functional/test_1040_install_repository_basic_circular_dependencies.py +++ b/lib/tool_shed/test/functional/test_1040_install_repository_basic_circular_dependencies.py @@ -22,15 +22,7 @@ class TestInstallingCircularDependencies(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_freebayes_repository(self): """Create and populate freebayes_0040.""" diff --git a/lib/tool_shed/test/functional/test_1050_circular_dependencies_4_levels.py b/lib/tool_shed/test/functional/test_1050_circular_dependencies_4_levels.py index 7b29da1f40f..60154e18d95 100644 --- a/lib/tool_shed/test/functional/test_1050_circular_dependencies_4_levels.py +++ b/lib/tool_shed/test/functional/test_1050_circular_dependencies_4_levels.py @@ -39,15 +39,7 @@ class TestInstallRepositoryCircularDependencies(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_convert_repository(self): """Create and populate convert_chars_0050.""" 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 524047b499f..00d9b0bf4f0 100644 --- a/lib/tool_shed/test/functional/test_1070_invalid_tool.py +++ b/lib/tool_shed/test/functional/test_1070_invalid_tool.py @@ -17,15 +17,7 @@ class TestFreebayesRepository(ShedTwillTestCase): """Create necessary user accounts and login as an admin user.""" self.galaxy_login(email=common.admin_email, username=common.admin_username) 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_ensure_existence_of_repository_and_category(self): """Create freebayes repository and upload only freebayes.xml. This should result in an error message and invalid tool.""" 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 5842e81ff88..12d1e7f51cb 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 @@ -28,15 +28,7 @@ class TestRepositoryDependencies(ShedTwillTestCase): """Create necessary user accounts and login as an admin user.""" self.galaxy_login(email=common.admin_email, username=common.admin_username) 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_and_populate_column_repository(self): """Create the category for this test suite, then create and populate column_maker.""" 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 70ac52b6a03..8fe92e3cbbc 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 @@ -26,15 +26,7 @@ class TestRepositoryDependencies(ShedTwillTestCase): """Create necessary user accounts and login as an admin user.""" self.galaxy_login(email=common.admin_email, username=common.admin_username) 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_and_populate_column_repository(self): """Create a category for this test suite and add repositories to it.""" 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 7eac46d5e7b..02972015f67 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 @@ -22,15 +22,7 @@ class TestRepositoryDependencies(ShedTwillTestCase): """Create necessary user accounts and login as an admin user.""" self.galaxy_login(email=common.admin_email, username=common.admin_username) 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_and_populate_column_repository(self): """Create a category for this test suite and add repositories to it.""" diff --git a/lib/tool_shed/test/functional/test_1120_install_repository_with_complex_dependencies.py b/lib/tool_shed/test/functional/test_1120_install_repository_with_complex_dependencies.py index d97b9534655..91c23eafb26 100644 --- a/lib/tool_shed/test/functional/test_1120_install_repository_with_complex_dependencies.py +++ b/lib/tool_shed/test/functional/test_1120_install_repository_with_complex_dependencies.py @@ -28,15 +28,7 @@ class TestInstallingComplexRepositoryDependencies(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_bwa_package_repository(self): """Create and populate package_bwa_0_5_9_0100.""" diff --git a/lib/tool_shed/test/functional/test_1130_install_repository_with_invalid_repository_dependency.py b/lib/tool_shed/test/functional/test_1130_install_repository_with_invalid_repository_dependency.py index a1f56f391da..cc63e9e54d1 100644 --- a/lib/tool_shed/test/functional/test_1130_install_repository_with_invalid_repository_dependency.py +++ b/lib/tool_shed/test/functional/test_1130_install_repository_with_invalid_repository_dependency.py @@ -22,15 +22,7 @@ class TestBasicRepositoryDependencies(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts and login as an 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_category(self): """Create a category for this test suite""" diff --git a/lib/tool_shed/test/functional/test_1140_simple_repository_dependency_multiple_owners.py b/lib/tool_shed/test/functional/test_1140_simple_repository_dependency_multiple_owners.py index 1a9c4c08921..affccd8c3fb 100644 --- a/lib/tool_shed/test/functional/test_1140_simple_repository_dependency_multiple_owners.py +++ b/lib/tool_shed/test/functional/test_1140_simple_repository_dependency_multiple_owners.py @@ -37,21 +37,8 @@ class TestInstallRepositoryMultipleOwners(ShedTwillTestCase): Previously created accounts will not be re-created. """ 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.test_user_2_email, username=common.test_user_2_name) - test_user_2 = self.test_db_util.get_user(common.test_user_1_email) - assert ( - test_user_2 is not None - ), f"Problem retrieving user with email {common.test_user_2_email} from the database" - self.test_db_util.get_private_role(test_user_2) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_datatypes_repository(self): """Create and populate the blast_datatypes_0120 repository diff --git a/lib/tool_shed/test/functional/test_1160_tool_help_images.py b/lib/tool_shed/test/functional/test_1160_tool_help_images.py index 718a955761f..5d6f33cdbaf 100644 --- a/lib/tool_shed/test/functional/test_1160_tool_help_images.py +++ b/lib/tool_shed/test/functional/test_1160_tool_help_images.py @@ -26,15 +26,7 @@ class TestToolHelpImages(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_htseq_count_repository(self): """Create and populate htseq_count_0140. 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 266c59ddcda..ada5e3acb45 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 @@ -42,15 +42,7 @@ class TestSimplePriorInstallation(ShedTwillTestCase): """Create necessary user accounts.""" self.galaxy_login(email=common.admin_email, username=common.admin_username) 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_convert_repository(self): """Create and populate convert_chars_0150.""" 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 20f92c9227a..d78b0dae319 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 @@ -55,15 +55,7 @@ class TestSimplePriorInstallation(ShedTwillTestCase): """Create necessary user accounts.""" self.galaxy_login(email=common.admin_email, username=common.admin_username) 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_convert_repository(self): """Create and populate convert_chars_0160.""" diff --git a/lib/tool_shed/test/functional/test_1190_complex_prior_installation_required.py b/lib/tool_shed/test/functional/test_1190_complex_prior_installation_required.py index e24ebfdab00..aa697481767 100644 --- a/lib/tool_shed/test/functional/test_1190_complex_prior_installation_required.py +++ b/lib/tool_shed/test/functional/test_1190_complex_prior_installation_required.py @@ -39,15 +39,7 @@ class TestComplexPriorInstallation(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_matplotlib_repository(self): """Create and populate the package_matplotlib_1_2_0170 repository. 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 c9866871627..aea8956ed9f 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 @@ -10,15 +10,7 @@ class UninstallingAndReinstallingRepositories(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) self.galaxy_login(email=common.admin_email, username=common.admin_username) def test_0005_ensure_repositories_and_categories_exist(self): 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 52b1670a1e0..a1a95a18e56 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 @@ -13,15 +13,7 @@ class UninstallingAndReinstallingRepositories(ShedTwillTestCase): """Create necessary user accounts.""" self.galaxy_login(email=common.admin_email, username=common.admin_username) 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_ensure_repositories_and_categories_exist(self): """Create the 0010 category and upload the freebayes repository to the tool shed, if necessary.""" 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 0ba69beee96..32513136e7d 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 @@ -23,15 +23,7 @@ class UninstallingAndReinstallingRepositories(ShedTwillTestCase): """Create necessary user accounts.""" self.galaxy_login(email=common.admin_email, username=common.admin_username) 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_ensure_repositories_and_categories_exist(self): """Create the 0030 category and upload the emboss repository to the tool shed, if necessary.""" diff --git a/lib/tool_shed/test/functional/test_1300_reset_all_metadata.py b/lib/tool_shed/test/functional/test_1300_reset_all_metadata.py index 038b032cc36..68b45dfdcc3 100644 --- a/lib/tool_shed/test/functional/test_1300_reset_all_metadata.py +++ b/lib/tool_shed/test/functional/test_1300_reset_all_metadata.py @@ -47,15 +47,7 @@ class TestResetInstalledRepositoryMetadata(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_categories(self): """Create the categories for the repositories in this test script.""" 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 af6f2b8bbfa..fa95795a7f0 100644 --- a/lib/tool_shed/test/functional/test_1410_update_manager.py +++ b/lib/tool_shed/test/functional/test_1410_update_manager.py @@ -33,15 +33,7 @@ class TestUpdateManager(ShedTwillTestCase): Previously created accounts will not be re-created. """ 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) self.galaxy_login(email=common.admin_email, username=common.admin_username) def test_0005_create_filtering_repository(self): diff --git a/lib/tool_shed/test/functional/test_1430_repair_installed_repository.py b/lib/tool_shed/test/functional/test_1430_repair_installed_repository.py index 5eb9e9566a3..9d71d177f7d 100644 --- a/lib/tool_shed/test/functional/test_1430_repair_installed_repository.py +++ b/lib/tool_shed/test/functional/test_1430_repair_installed_repository.py @@ -40,22 +40,9 @@ class TestRepairRepository(ShedTwillTestCase): def test_0000_initiate_users_and_category(self): """Create necessary user accounts and login as an admin user.""" self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) self.create_category(name=category_name, description=category_description) self.login(email=common.test_user_2_email, username=common.test_user_2_name) - test_user_2 = self.test_db_util.get_user(common.test_user_2_email) - assert ( - test_user_2 is not None - ), f"Problem retrieving user with email {common.test_user_2_email} from the database" - self.test_db_util.get_private_role(test_user_2) 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) def test_0005_create_filter_repository(self): """Create and populate the filter_1430 repository. diff --git a/lib/tool_shed/test/functional/test_1460_data_managers.py b/lib/tool_shed/test/functional/test_1460_data_managers.py index 95c097d34eb..267edfd6ca3 100644 --- a/lib/tool_shed/test/functional/test_1460_data_managers.py +++ b/lib/tool_shed/test/functional/test_1460_data_managers.py @@ -33,22 +33,9 @@ class TestDataManagers(ShedTwillTestCase): def test_0000_initiate_users_and_category(self): """Create necessary user accounts and login as an admin user.""" self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) self.create_category(name=category_name, description=category_description) self.login(email=common.test_user_2_email, username=common.test_user_2_name) - test_user_2 = self.test_db_util.get_user(common.test_user_2_email) - assert ( - test_user_2 is not None - ), f"Problem retrieving user with email {common.test_user_2_email} from the database" - self.test_db_util.get_private_role(test_user_2) 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) def test_0010_create_data_manager_repository(self): """Create and populate data_manager_1460. diff --git a/lib/tool_shed/test/functional/test_1470_updating_installed_repositories.py b/lib/tool_shed/test/functional/test_1470_updating_installed_repositories.py index 544291abdae..44c7542afbc 100644 --- a/lib/tool_shed/test/functional/test_1470_updating_installed_repositories.py +++ b/lib/tool_shed/test/functional/test_1470_updating_installed_repositories.py @@ -32,15 +32,7 @@ class TestUpdateInstalledRepository(ShedTwillTestCase): def test_0000_initiate_users(self): """Create necessary user accounts.""" 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 ( - test_user_1 is not None - ), f"Problem retrieving user with email {common.test_user_1_email} from the database" - self.test_db_util.get_private_role(test_user_1) self.login(email=common.admin_email, username=common.admin_username) - admin_user = self.test_db_util.get_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_private_role(admin_user) def test_0005_create_filtering_repository(self): """Create and populate the filtering_0530 repository."""