Merge pull request #8962 from jmchilton/package_tests_2

Create packages for Galaxy tests and infrastructure.

lib/galaxy_test/api/_framework.py

@@ -0,0 +1,5 @@
+# TODO: implement a remote-only version of ApiTestCase if galaxy_test.driver isn't
+# available. Most of these tests do not depend on Galaxy internals.
+from galaxy_test.driver.api import ApiTestCase
+
+__all__ = ('ApiTestCase', )

lib/galaxy_test/api/test_api_batch.py

@@ -2,10 +2,10 @@ import json
 
 from requests import post
 
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 
-class ApiBatchTestCase(api.ApiTestCase):
+class ApiBatchTestCase(ApiTestCase):
 
     def _get_api_key(self, admin=False):
         return self.galaxy_interactor.api_key if not admin else self.galaxy_interactor.master_api_key

lib/galaxy_test/api/test_authenticate.py

@@ -2,13 +2,13 @@ import base64
 
 from requests import get
 
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 TEST_USER_EMAIL = "auth_user_test@bx.psu.edu"
 TEST_USER_PASSWORD = "testpassword1"
 
 
-class AuthenticationApiTestCase(api.ApiTestCase):
+class AuthenticationApiTestCase(ApiTestCase):
 
     def test_auth(self):
         self._setup_user(TEST_USER_EMAIL, TEST_USER_PASSWORD)

lib/galaxy_test/api/test_configuration.py

@@ -5,7 +5,7 @@ from galaxy_test.base.api_asserts import (
 from galaxy_test.base.populators import (
     LibraryPopulator
 )
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 TEST_KEYS_FOR_ALL_USERS = [
     'enable_unique_workflow_defaults',
@@ -24,7 +24,7 @@ TEST_KEYS_FOR_ADMIN_ONLY = [
 ]
 
 
-class ConfigurationApiTestCase(api.ApiTestCase):
+class ConfigurationApiTestCase(ApiTestCase):
 
     def setUp(self):
         super(ConfigurationApiTestCase, self).setUp()

lib/galaxy_test/api/test_dataset_collections.py

@@ -4,10 +4,10 @@ import tarfile
 from six import BytesIO
 
 from galaxy_test.base.populators import DatasetCollectionPopulator, DatasetPopulator, skip_if_github_down
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 
-class DatasetCollectionApiTestCase(api.ApiTestCase):
+class DatasetCollectionApiTestCase(ApiTestCase):
 
     def setUp(self):
         super(DatasetCollectionApiTestCase, self).setUp()

lib/galaxy_test/api/test_datasets.py

@@ -6,10 +6,10 @@ from galaxy_test.base.populators import (
     DatasetCollectionPopulator,
     DatasetPopulator,
 )
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 
-class DatasetsApiTestCase(api.ApiTestCase):
+class DatasetsApiTestCase(ApiTestCase):
 
     def setUp(self):
         super(DatasetsApiTestCase, self).setUp()

lib/galaxy_test/api/test_datatypes.py

@@ -2,12 +2,12 @@ import time
 
 from requests import put
 
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 HIDDEN_DURING_UPLOAD_DATATYPE = "fli"
 
 
-class DatatypesApiTestCase(api.ApiTestCase):
+class DatatypesApiTestCase(ApiTestCase):
 
     def test_index(self):
         datatypes = self._index_datatypes()

lib/galaxy_test/api/test_framework.py

@@ -1,9 +1,9 @@
 # This file doesn't test any API in particular but is meant to functionally
 # test the API framework itself.
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 
-class ApiFrameworkTestCase(api.ApiTestCase):
+class ApiFrameworkTestCase(ApiTestCase):
 
     # Next several tests test the API's run_as functionality.
     def test_user_cannont_run_as(self):

lib/galaxy_test/api/test_galaxy_interactor.py

@@ -2,10 +2,10 @@
 
 from packaging.version import Version
 
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 
-class GalaxyInteractorBackwardCompatTestCase(api.ApiTestCase):
+class GalaxyInteractorBackwardCompatTestCase(ApiTestCase):
 
     def test_local_test_data_download(self):
         self.galaxy_interactor._target_galaxy_version = Version("18.09")

lib/galaxy_test/api/test_histories.py

@@ -10,10 +10,10 @@ from galaxy_test.base.populators import (
     DatasetCollectionPopulator,
     DatasetPopulator,
 )
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 
-class HistoriesApiTestCase(api.ApiTestCase):
+class HistoriesApiTestCase(ApiTestCase):
 
     def setUp(self):
         super(HistoriesApiTestCase, self).setUp()

lib/galaxy_test/api/test_history_contents.py

@@ -11,11 +11,11 @@ from galaxy_test.base.populators import (
     skip_without_tool,
     TestsDatasets,
 )
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 
 # TODO: Test anonymous access.
-class HistoryContentsApiTestCase(api.ApiTestCase, TestsDatasets):
+class HistoryContentsApiTestCase(ApiTestCase, TestsDatasets):
 
     def setUp(self):
         super(HistoryContentsApiTestCase, self).setUp()

lib/galaxy_test/api/test_history_contents_provenance.py

@@ -1,8 +1,8 @@
 from galaxy_test.base.populators import DatasetPopulator
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 
-class TestProvenance(api.ApiTestCase):
+class TestProvenance(ApiTestCase):
 
     def setUp(self):
         super(TestProvenance, self).setUp()

lib/galaxy_test/api/test_jobs.py

@@ -15,10 +15,10 @@ from galaxy_test.base.populators import (
     wait_on,
     wait_on_state,
 )
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 
-class JobsApiTestCase(api.ApiTestCase):
+class JobsApiTestCase(ApiTestCase):
 
     def setUp(self):
         super(JobsApiTestCase, self).setUp()

lib/galaxy_test/api/test_libraries.py

@@ -8,13 +8,13 @@ from galaxy_test.base.populators import (
     LibraryPopulator,
     TestsDatasets,
 )
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 FILE_URL = 'https://raw.githubusercontent.com/galaxyproject/galaxy/dev/test-data/4.bed'
 FILE_MD5 = "37b59762b59fff860460522d271bc111"
 
 
-class LibrariesApiTestCase(api.ApiTestCase, TestsDatasets):
+class LibrariesApiTestCase(ApiTestCase, TestsDatasets):
 
     def setUp(self):
         super(LibrariesApiTestCase, self).setUp()

lib/galaxy_test/api/test_pages.py

@@ -2,10 +2,10 @@ from requests import delete
 
 from galaxy.exceptions import error_codes
 from galaxy_test.base.populators import DatasetPopulator
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 
-class BasePageApiTestCase(api.ApiTestCase):
+class BasePageApiTestCase(ApiTestCase):
 
     def _create_valid_page_with_slug(self, slug):
         page_request = self._test_page_payload(slug=slug)

lib/galaxy_test/api/test_roles.py

@@ -7,10 +7,10 @@ from galaxy_test.base.api_asserts import (
 from galaxy_test.base.populators import (
     DatasetPopulator,
 )
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 
-class RolesApiTestCase(api.ApiTestCase):
+class RolesApiTestCase(ApiTestCase):
 
     def setUp(self):
         super(RolesApiTestCase, self).setUp()

lib/galaxy_test/api/test_search.py

@@ -1,10 +1,10 @@
 from requests import delete
 
 from galaxy_test.base.populators import WorkflowPopulator
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 
-class SearchApiTestCase(api.ApiTestCase):
+class SearchApiTestCase(ApiTestCase):
 
     def test_search_workflows(self):
         workflow_populator = WorkflowPopulator(self.galaxy_interactor)

lib/galaxy_test/api/test_tool_data.py

@@ -4,10 +4,10 @@ from __future__ import print_function
 
 import operator
 
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 
-class ToolDataApiTestCase(api.ApiTestCase):
+class ToolDataApiTestCase(ApiTestCase):
 
     def test_admin_only(self):
         index_response = self._get("tool_data", admin=False)

lib/galaxy_test/api/test_tools.py

@@ -17,7 +17,7 @@ from galaxy_test.base.populators import (
     skip_without_tool,
     uses_test_history,
 )
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 
 MINIMAL_TOOL = {
@@ -43,7 +43,7 @@ MINIMAL_TOOL_NO_ID = {
 }
 
 
-class ToolsTestCase(api.ApiTestCase):
+class ToolsTestCase(ApiTestCase):
 
     def setUp(self):
         super(ToolsTestCase, self).setUp()

lib/galaxy_test/api/test_tools_upload.py

@@ -12,10 +12,10 @@ from galaxy_test.base.populators import (
     skip_without_datatype,
     uses_test_history,
 )
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 
-class ToolsUploadTestCase(api.ApiTestCase):
+class ToolsUploadTestCase(ApiTestCase):
 
     def setUp(self):
         super(ToolsUploadTestCase, self).setUp()

lib/galaxy_test/api/test_tours.py

@@ -1,7 +1,7 @@
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 
-class TourApiTestCase(api.ApiTestCase):
+class TourApiTestCase(ApiTestCase):
 
     def test_index(self):
         response = self._get("tours")

lib/galaxy_test/api/test_users.py

@@ -7,7 +7,7 @@ from requests import (
 )
 
 from galaxy_test.base.populators import skip_without_tool
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 TEST_USER_EMAIL = "user_for_users_index_test@bx.psu.edu"
 TEST_USER_EMAIL_DELETE = "user_for_delete_test@bx.psu.edu"
@@ -15,7 +15,7 @@ TEST_USER_EMAIL_PURGE = "user_for_purge_test@bx.psu.edu"
 TEST_USER_EMAIL_UNDELETE = "user_for_undelete_test@bx.psu.edu"
 
 
-class UsersApiTestCase(api.ApiTestCase):
+class UsersApiTestCase(ApiTestCase):
 
     def test_index(self):
         self._setup_user(TEST_USER_EMAIL)

lib/galaxy_test/api/test_visualizations.py

@@ -6,7 +6,7 @@ from requests import (
 )
 
 from galaxy_test.base.api_asserts import assert_has_keys
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 INDEX_KEYS = [
     'id', 'title', 'type', 'dbkey', 'url'
@@ -19,7 +19,7 @@ REVISION_KEYS = [
 ]
 
 
-class VisualizationsApiTestCase(api.ApiTestCase):
+class VisualizationsApiTestCase(ApiTestCase):
 
     def test_index_and_show(self):
         self._create_viz()  # to ensure on exists to index

lib/galaxy_test/api/test_webhooks.py

@@ -1,7 +1,7 @@
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 
-class WebhooksApiTestCase(api.ApiTestCase):
+class WebhooksApiTestCase(ApiTestCase):
 
     def setUp(self):
         super(WebhooksApiTestCase, self).setUp()

lib/galaxy_test/api/test_workflows.py

@@ -30,7 +30,7 @@ from galaxy_test.base.workflow_fixtures import (
     WORKFLOW_WITH_OUTPUT_COLLECTION_MAPPING,
     WORKFLOW_WITH_RULES_1,
 )
-from galaxy_test.driver import api
+from ._framework import ApiTestCase
 
 
 NESTED_WORKFLOW_AUTO_LABELS = """
@@ -75,7 +75,7 @@ steps:
 """
 
 
-class BaseWorkflowsApiTestCase(api.ApiTestCase):
+class BaseWorkflowsApiTestCase(ApiTestCase):
     # TODO: Find a new file for this class.
 
     def setUp(self):

lib/galaxy_test/driver/driver_util.py

@@ -50,7 +50,7 @@ DEFAULT_WEB_HOST = socket.gethostbyname('localhost')
 DEFAULT_CONFIG_PREFIX = "GALAXY"
 GALAXY_TEST_DIRECTORY = os.path.join(galaxy_root, "test")
 GALAXY_TEST_FILE_DIR = "test-data,https://github.com/galaxyproject/galaxy-test-data.git"
-TOOL_SHED_TEST_DATA = os.path.join(GALAXY_TEST_DIRECTORY, "shed_functional", "test_data")
+TOOL_SHED_TEST_DATA = os.path.join(galaxy_root, "lib", "tool_shed", "test", "test_data")
 TEST_WEBHOOKS_DIR = os.path.join(galaxy_root, "test", "functional", "webhooks")
 FRAMEWORK_TOOLS_DIR = os.path.join(GALAXY_TEST_DIRECTORY, "functional", "tools")
 FRAMEWORK_UPLOAD_TOOL_CONF = os.path.join(FRAMEWORK_TOOLS_DIR, "upload_tool_conf.xml")

lib/tool_shed/test/functional/test_0000_basic_repository_features.py

@@ -1,6 +1,6 @@
 import logging
 
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 repository_name = 'filtering_0000'
 repository_description = "Galaxy's filtering tool for test 0000"

lib/tool_shed/test/functional/test_0010_repository_with_tool_dependencies.py

@@ -1,6 +1,6 @@
 import os
 
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 repository_name = 'freebayes_0010'
 repository_description = "Galaxy's freebayes tool"

lib/tool_shed/test/functional/test_0020_basic_repository_dependencies.py

@@ -1,4 +1,4 @@
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 datatypes_repository_name = 'emboss_datatypes_0020'
 datatypes_repository_description = "Galaxy applicable data formats used by Emboss tools."

lib/tool_shed/test/functional/test_0030_repository_dependency_revisions.py

@@ -1,4 +1,4 @@
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 datatypes_repository_name = 'emboss_datatypes_0030'
 datatypes_repository_description = "Galaxy applicable data formats used by Emboss tools."

lib/tool_shed/test/functional/test_0040_repository_circular_dependencies.py

@@ -1,4 +1,4 @@
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 freebayes_repository_name = 'freebayes_0040'
 freebayes_repository_description = "Galaxy's freebayes tool for test 0040"

lib/tool_shed/test/functional/test_0050_circular_dependencies_4_levels.py

@@ -1,4 +1,4 @@
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 emboss_datatypes_repository_name = 'emboss_datatypes_0050'
 emboss_datatypes_repository_description = "Datatypes for emboss"

lib/tool_shed/test/functional/test_0060_workflows.py

@@ -1,6 +1,6 @@
 import os
 
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 repository_name = 'filtering_0060'
 repository_description = "Galaxy's filtering tool for test 0060"

lib/tool_shed/test/functional/test_0070_invalid_tool.py

@@ -1,4 +1,4 @@
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 repository_name = 'bismark_0070'
 repository_description = "Galaxy's bismark wrapper"

lib/tool_shed/test/functional/test_0080_advanced_circular_dependencies.py

@@ -1,4 +1,4 @@
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 column_repository_name = 'column_maker_0080'
 column_repository_description = "Add column"

lib/tool_shed/test/functional/test_0090_tool_search.py

@@ -1,4 +1,4 @@
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 emboss_datatypes_repository_name = 'emboss_datatypes_0090'
 emboss_datatypes_repository_description = "Datatypes for emboss"

lib/tool_shed/test/functional/test_0100_complex_repository_dependencies.py

@@ -1,7 +1,7 @@
 import logging
 import os
 
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 log = logging.getLogger(__name__)
 

lib/tool_shed/test/functional/test_0110_invalid_simple_repository_dependencies.py

@@ -1,4 +1,4 @@
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 datatypes_repository_name = 'emboss_datatypes_0110'
 datatypes_repository_description = "Galaxy applicable data formats used by Emboss tools."

lib/tool_shed/test/functional/test_0120_simple_repository_dependency_multiple_owners.py

@@ -1,4 +1,4 @@
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 datatypes_repository_name = 'blast_datatypes_0120'
 datatypes_repository_description = 'Galaxy applicable datatypes for BLAST'

lib/tool_shed/test/functional/test_0130_datatype_converters.py

@@ -1,4 +1,4 @@
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 repository_name = 'bed_to_gff_0130'
 repository_description = "Converter: BED to GFF"

lib/tool_shed/test/functional/test_0140_tool_help_images.py

@@ -1,6 +1,6 @@
 import logging
 
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 log = logging.getLogger(__name__)
 

lib/tool_shed/test/functional/test_0150_prior_installation_required.py

@@ -1,4 +1,4 @@
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 column_repository_name = 'column_maker_0150'
 column_repository_description = "Add column"

lib/tool_shed/test/functional/test_0160_circular_prior_installation_required.py

@@ -1,4 +1,4 @@
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 filter_repository_name = 'filtering_0160'
 filter_repository_description = "Galaxy's filtering tool for test 0160"

lib/tool_shed/test/functional/test_0170_complex_prior_installation_required.py

@@ -1,6 +1,6 @@
 import os
 
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 matplotlib_repository_name = 'package_matplotlib_1_2_0170'
 matplotlib_repository_description = "Contains a tool dependency definition that downloads and compiles version 1.2.x of the the python matplotlib package."

lib/tool_shed/test/functional/test_0300_reset_all_metadata.py

@@ -1,6 +1,6 @@
 import os
 
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 datatypes_repository_name = 'emboss_datatypes_0020'
 datatypes_repository_description = "Galaxy applicable data formats used by Emboss tools."

lib/tool_shed/test/functional/test_0310_hg_api_features.py

@@ -1,7 +1,7 @@
 import logging
 import os
 
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 log = logging.getLogger(__name__)
 

lib/tool_shed/test/functional/test_0400_repository_component_reviews.py

@@ -1,4 +1,4 @@
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 repository_name = 'filtering_0400'
 repository_description = 'Galaxy filtering tool for test 0400'

lib/tool_shed/test/functional/test_0410_repository_component_review_access_control.py

@@ -1,4 +1,4 @@
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 repository_name = 'filtering_0410'
 repository_description = 'Galaxy filtering tool for test 0410'

lib/tool_shed/test/functional/test_0420_citable_urls_for_repositories.py

@@ -1,6 +1,6 @@
 import logging
 
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 log = logging.getLogger(__name__)
 

lib/tool_shed/test/functional/test_0430_browse_utilities.py

@@ -1,6 +1,6 @@
 import logging
 
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 log = logging.getLogger(__name__)
 

lib/tool_shed/test/functional/test_0440_deleting_dependency_definitions.py

@@ -1,4 +1,4 @@
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 column_repository_name = 'column_maker_0440'
 column_repository_description = "Add column"

lib/tool_shed/test/functional/test_0460_upload_to_repository.py

@@ -1,6 +1,6 @@
 import logging
 
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 log = logging.getLogger(__name__)
 

lib/tool_shed/test/functional/test_0470_tool_dependency_repository_type.py

@@ -1,6 +1,6 @@
 import logging
 
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 log = logging.getLogger(__name__)
 

lib/tool_shed/test/functional/test_0480_tool_dependency_xml_verification.py

@@ -1,6 +1,6 @@
 import logging
 
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 log = logging.getLogger(__name__)
 

lib/tool_shed/test/functional/test_0490_export_import_repositories.py

@@ -1,7 +1,7 @@
 import logging
 import os
 
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 log = logging.getLogger(__name__)
 

lib/tool_shed/test/functional/test_0500_export_repository_simple_dependency.py

@@ -1,7 +1,7 @@
 import logging
 import os
 
-from shed_functional.base.twilltestcase import common, ShedTwillTestCase
+from ..base.twilltestcase import common, ShedTwillTestCase
 
 log = logging.getLogger(__name__)