diff --git a/test/api/__init__.py b/lib/galaxy_test/api/__init__.py similarity index 100% rename from test/api/__init__.py rename to lib/galaxy_test/api/__init__.py diff --git a/lib/galaxy_test/api/_framework.py b/lib/galaxy_test/api/_framework.py new file mode 100644 index 00000000000..264851d707a --- /dev/null +++ b/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', ) diff --git a/test/api/embed_test_1.gxwf.yml b/lib/galaxy_test/api/embed_test_1.gxwf.yml similarity index 100% rename from test/api/embed_test_1.gxwf.yml rename to lib/galaxy_test/api/embed_test_1.gxwf.yml diff --git a/test/api/embed_test_1_tool.gxtool.yml b/lib/galaxy_test/api/embed_test_1_tool.gxtool.yml similarity index 100% rename from test/api/embed_test_1_tool.gxtool.yml rename to lib/galaxy_test/api/embed_test_1_tool.gxtool.yml diff --git a/test/api/test_api_batch.py b/lib/galaxy_test/api/test_api_batch.py similarity index 97% rename from test/api/test_api_batch.py rename to lib/galaxy_test/api/test_api_batch.py index 115d633d813..c849ee71c47 100644 --- a/test/api/test_api_batch.py +++ b/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 diff --git a/test/api/test_authenticate.py b/lib/galaxy_test/api/test_authenticate.py similarity index 91% rename from test/api/test_authenticate.py rename to lib/galaxy_test/api/test_authenticate.py index 26b8cc5eeed..04d59a415c5 100644 --- a/test/api/test_authenticate.py +++ b/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) diff --git a/test/api/test_configuration.py b/lib/galaxy_test/api/test_configuration.py similarity index 96% rename from test/api/test_configuration.py rename to lib/galaxy_test/api/test_configuration.py index f2ab0926e67..0ddb12e333e 100644 --- a/test/api/test_configuration.py +++ b/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() diff --git a/test/api/test_dataset_collections.py b/lib/galaxy_test/api/test_dataset_collections.py similarity index 99% rename from test/api/test_dataset_collections.py rename to lib/galaxy_test/api/test_dataset_collections.py index f563b9dd9e6..7f579d56ab2 100644 --- a/test/api/test_dataset_collections.py +++ b/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() diff --git a/test/api/test_datasets.py b/lib/galaxy_test/api/test_datasets.py similarity index 98% rename from test/api/test_datasets.py rename to lib/galaxy_test/api/test_datasets.py index 7a1407f3523..48463b46c74 100644 --- a/test/api/test_datasets.py +++ b/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() diff --git a/test/api/test_datatypes.py b/lib/galaxy_test/api/test_datatypes.py similarity index 97% rename from test/api/test_datatypes.py rename to lib/galaxy_test/api/test_datatypes.py index d095d180e4d..ed8084d7916 100644 --- a/test/api/test_datatypes.py +++ b/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() diff --git a/test/api/test_framework.py b/lib/galaxy_test/api/test_framework.py similarity index 93% rename from test/api/test_framework.py rename to lib/galaxy_test/api/test_framework.py index c660346341b..65dc1df5ac9 100644 --- a/test/api/test_framework.py +++ b/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): diff --git a/test/api/test_galaxy_interactor.py b/lib/galaxy_test/api/test_galaxy_interactor.py similarity index 80% rename from test/api/test_galaxy_interactor.py rename to lib/galaxy_test/api/test_galaxy_interactor.py index 7db692afa34..fbc5de71728 100644 --- a/test/api/test_galaxy_interactor.py +++ b/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") diff --git a/test/api/test_histories.py b/lib/galaxy_test/api/test_histories.py similarity index 99% rename from test/api/test_histories.py rename to lib/galaxy_test/api/test_histories.py index 6c24868c96c..1be49800e90 100644 --- a/test/api/test_histories.py +++ b/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() diff --git a/test/api/test_history_contents.py b/lib/galaxy_test/api/test_history_contents.py similarity index 99% rename from test/api/test_history_contents.py rename to lib/galaxy_test/api/test_history_contents.py index 03c017220f5..2f8b91703cf 100644 --- a/test/api/test_history_contents.py +++ b/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() diff --git a/test/api/test_history_contents_provenance.py b/lib/galaxy_test/api/test_history_contents_provenance.py similarity index 89% rename from test/api/test_history_contents_provenance.py rename to lib/galaxy_test/api/test_history_contents_provenance.py index f9506010111..07a07eb8eea 100644 --- a/test/api/test_history_contents_provenance.py +++ b/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() diff --git a/test/api/test_jobs.py b/lib/galaxy_test/api/test_jobs.py similarity index 99% rename from test/api/test_jobs.py rename to lib/galaxy_test/api/test_jobs.py index 951551d47d3..e0e48767447 100644 --- a/test/api/test_jobs.py +++ b/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() diff --git a/test/api/test_libraries.py b/lib/galaxy_test/api/test_libraries.py similarity index 99% rename from test/api/test_libraries.py rename to lib/galaxy_test/api/test_libraries.py index abcdd33167f..2bfe863c01d 100644 --- a/test/api/test_libraries.py +++ b/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() diff --git a/test/api/test_page_revisions.py b/lib/galaxy_test/api/test_page_revisions.py similarity index 100% rename from test/api/test_page_revisions.py rename to lib/galaxy_test/api/test_page_revisions.py diff --git a/test/api/test_pages.py b/lib/galaxy_test/api/test_pages.py similarity index 98% rename from test/api/test_pages.py rename to lib/galaxy_test/api/test_pages.py index 09bc829f9e5..18b2201143f 100644 --- a/test/api/test_pages.py +++ b/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) diff --git a/test/api/test_roles.py b/lib/galaxy_test/api/test_roles.py similarity index 98% rename from test/api/test_roles.py rename to lib/galaxy_test/api/test_roles.py index 2bf83ba0d04..0086b080bfe 100644 --- a/test/api/test_roles.py +++ b/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() diff --git a/test/api/test_search.py b/lib/galaxy_test/api/test_search.py similarity index 94% rename from test/api/test_search.py rename to lib/galaxy_test/api/test_search.py index 60fc2d2b722..80034e9f8fa 100644 --- a/test/api/test_search.py +++ b/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) diff --git a/test/api/test_tool_data.py b/lib/galaxy_test/api/test_tool_data.py similarity index 97% rename from test/api/test_tool_data.py rename to lib/galaxy_test/api/test_tool_data.py index c5aca42a0c7..fd928c87304 100644 --- a/test/api/test_tool_data.py +++ b/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) diff --git a/test/api/test_tools.py b/lib/galaxy_test/api/test_tools.py similarity index 99% rename from test/api/test_tools.py rename to lib/galaxy_test/api/test_tools.py index 5a86c4fab26..a01e5a6214e 100644 --- a/test/api/test_tools.py +++ b/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() diff --git a/test/api/test_tools_upload.py b/lib/galaxy_test/api/test_tools_upload.py similarity index 99% rename from test/api/test_tools_upload.py rename to lib/galaxy_test/api/test_tools_upload.py index 41115896ba3..a1f58498619 100644 --- a/test/api/test_tools_upload.py +++ b/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() diff --git a/test/api/test_tours.py b/lib/galaxy_test/api/test_tours.py similarity index 86% rename from test/api/test_tours.py rename to lib/galaxy_test/api/test_tours.py index 97430198aff..b15a1e71442 100644 --- a/test/api/test_tours.py +++ b/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") diff --git a/test/api/test_users.py b/lib/galaxy_test/api/test_users.py similarity index 99% rename from test/api/test_users.py rename to lib/galaxy_test/api/test_users.py index 3ffb3c533f6..d1d1c2411f4 100644 --- a/test/api/test_users.py +++ b/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) diff --git a/test/api/test_visualizations.py b/lib/galaxy_test/api/test_visualizations.py similarity index 97% rename from test/api/test_visualizations.py rename to lib/galaxy_test/api/test_visualizations.py index cabcfe495f3..f60422a1b64 100644 --- a/test/api/test_visualizations.py +++ b/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 diff --git a/test/api/test_webhooks.py b/lib/galaxy_test/api/test_webhooks.py similarity index 93% rename from test/api/test_webhooks.py rename to lib/galaxy_test/api/test_webhooks.py index 4aad3b3e67c..2758e7675d6 100644 --- a/test/api/test_webhooks.py +++ b/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() diff --git a/test/api/test_workflow_extraction.py b/lib/galaxy_test/api/test_workflow_extraction.py similarity index 100% rename from test/api/test_workflow_extraction.py rename to lib/galaxy_test/api/test_workflow_extraction.py diff --git a/test/api/test_workflows.py b/lib/galaxy_test/api/test_workflows.py similarity index 99% rename from test/api/test_workflows.py rename to lib/galaxy_test/api/test_workflows.py index facca556f6e..31ec8b3d59e 100644 --- a/test/api/test_workflows.py +++ b/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): diff --git a/test/api/test_workflows_from_yaml.py b/lib/galaxy_test/api/test_workflows_from_yaml.py similarity index 100% rename from test/api/test_workflows_from_yaml.py rename to lib/galaxy_test/api/test_workflows_from_yaml.py diff --git a/lib/galaxy_test/driver/driver_util.py b/lib/galaxy_test/driver/driver_util.py index 52b80582ca2..f6334b762ee 100644 --- a/lib/galaxy_test/driver/driver_util.py +++ b/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") diff --git a/test/selenium_tests/__init__.py b/lib/galaxy_test/selenium/__init__.py similarity index 100% rename from test/selenium_tests/__init__.py rename to lib/galaxy_test/selenium/__init__.py diff --git a/test/selenium_tests/framework.py b/lib/galaxy_test/selenium/framework.py similarity index 100% rename from test/selenium_tests/framework.py rename to lib/galaxy_test/selenium/framework.py diff --git a/test/selenium_tests/test_admin_app.py b/lib/galaxy_test/selenium/test_admin_app.py similarity index 100% rename from test/selenium_tests/test_admin_app.py rename to lib/galaxy_test/selenium/test_admin_app.py diff --git a/test/selenium_tests/test_anon_history.py b/lib/galaxy_test/selenium/test_anon_history.py similarity index 100% rename from test/selenium_tests/test_anon_history.py rename to lib/galaxy_test/selenium/test_anon_history.py diff --git a/test/selenium_tests/test_collection_builders.py b/lib/galaxy_test/selenium/test_collection_builders.py similarity index 100% rename from test/selenium_tests/test_collection_builders.py rename to lib/galaxy_test/selenium/test_collection_builders.py diff --git a/test/selenium_tests/test_custom_builds.py b/lib/galaxy_test/selenium/test_custom_builds.py similarity index 100% rename from test/selenium_tests/test_custom_builds.py rename to lib/galaxy_test/selenium/test_custom_builds.py diff --git a/test/selenium_tests/test_histories_list.py b/lib/galaxy_test/selenium/test_histories_list.py similarity index 100% rename from test/selenium_tests/test_histories_list.py rename to lib/galaxy_test/selenium/test_histories_list.py diff --git a/test/selenium_tests/test_history_copy_elements.py b/lib/galaxy_test/selenium/test_history_copy_elements.py similarity index 100% rename from test/selenium_tests/test_history_copy_elements.py rename to lib/galaxy_test/selenium/test_history_copy_elements.py diff --git a/test/selenium_tests/test_history_dataset_state.py b/lib/galaxy_test/selenium/test_history_dataset_state.py similarity index 100% rename from test/selenium_tests/test_history_dataset_state.py rename to lib/galaxy_test/selenium/test_history_dataset_state.py diff --git a/test/selenium_tests/test_history_multi_view.py b/lib/galaxy_test/selenium/test_history_multi_view.py similarity index 100% rename from test/selenium_tests/test_history_multi_view.py rename to lib/galaxy_test/selenium/test_history_multi_view.py diff --git a/test/selenium_tests/test_history_options.py b/lib/galaxy_test/selenium/test_history_options.py similarity index 100% rename from test/selenium_tests/test_history_options.py rename to lib/galaxy_test/selenium/test_history_options.py diff --git a/test/selenium_tests/test_history_panel.py b/lib/galaxy_test/selenium/test_history_panel.py similarity index 100% rename from test/selenium_tests/test_history_panel.py rename to lib/galaxy_test/selenium/test_history_panel.py diff --git a/test/selenium_tests/test_history_panel_collections.py b/lib/galaxy_test/selenium/test_history_panel_collections.py similarity index 100% rename from test/selenium_tests/test_history_panel_collections.py rename to lib/galaxy_test/selenium/test_history_panel_collections.py diff --git a/test/selenium_tests/test_history_panel_pagination.py b/lib/galaxy_test/selenium/test_history_panel_pagination.py similarity index 100% rename from test/selenium_tests/test_history_panel_pagination.py rename to lib/galaxy_test/selenium/test_history_panel_pagination.py diff --git a/test/selenium_tests/test_history_sharing.py b/lib/galaxy_test/selenium/test_history_sharing.py similarity index 100% rename from test/selenium_tests/test_history_sharing.py rename to lib/galaxy_test/selenium/test_history_sharing.py diff --git a/test/selenium_tests/test_jupyter.py b/lib/galaxy_test/selenium/test_jupyter.py similarity index 100% rename from test/selenium_tests/test_jupyter.py rename to lib/galaxy_test/selenium/test_jupyter.py diff --git a/test/selenium_tests/test_library_contents.py b/lib/galaxy_test/selenium/test_library_contents.py similarity index 100% rename from test/selenium_tests/test_library_contents.py rename to lib/galaxy_test/selenium/test_library_contents.py diff --git a/test/selenium_tests/test_library_landing.py b/lib/galaxy_test/selenium/test_library_landing.py similarity index 100% rename from test/selenium_tests/test_library_landing.py rename to lib/galaxy_test/selenium/test_library_landing.py diff --git a/test/selenium_tests/test_library_to_collections.py b/lib/galaxy_test/selenium/test_library_to_collections.py similarity index 100% rename from test/selenium_tests/test_library_to_collections.py rename to lib/galaxy_test/selenium/test_library_to_collections.py diff --git a/test/selenium_tests/test_login.py b/lib/galaxy_test/selenium/test_login.py similarity index 100% rename from test/selenium_tests/test_login.py rename to lib/galaxy_test/selenium/test_login.py diff --git a/test/selenium_tests/test_navigates_galaxy.py b/lib/galaxy_test/selenium/test_navigates_galaxy.py similarity index 100% rename from test/selenium_tests/test_navigates_galaxy.py rename to lib/galaxy_test/selenium/test_navigates_galaxy.py diff --git a/test/selenium_tests/test_pages.py b/lib/galaxy_test/selenium/test_pages.py similarity index 100% rename from test/selenium_tests/test_pages.py rename to lib/galaxy_test/selenium/test_pages.py diff --git a/test/selenium_tests/test_published_histories_grid.py b/lib/galaxy_test/selenium/test_published_histories_grid.py similarity index 100% rename from test/selenium_tests/test_published_histories_grid.py rename to lib/galaxy_test/selenium/test_published_histories_grid.py diff --git a/test/selenium_tests/test_registration.py b/lib/galaxy_test/selenium/test_registration.py similarity index 100% rename from test/selenium_tests/test_registration.py rename to lib/galaxy_test/selenium/test_registration.py diff --git a/test/selenium_tests/test_sizzle_loading.py b/lib/galaxy_test/selenium/test_sizzle_loading.py similarity index 100% rename from test/selenium_tests/test_sizzle_loading.py rename to lib/galaxy_test/selenium/test_sizzle_loading.py diff --git a/test/selenium_tests/test_stock_tours.py b/lib/galaxy_test/selenium/test_stock_tours.py similarity index 100% rename from test/selenium_tests/test_stock_tours.py rename to lib/galaxy_test/selenium/test_stock_tours.py diff --git a/test/selenium_tests/test_tool_describing_tours.py b/lib/galaxy_test/selenium/test_tool_describing_tours.py similarity index 100% rename from test/selenium_tests/test_tool_describing_tours.py rename to lib/galaxy_test/selenium/test_tool_describing_tours.py diff --git a/test/selenium_tests/test_tool_form.py b/lib/galaxy_test/selenium/test_tool_form.py similarity index 100% rename from test/selenium_tests/test_tool_form.py rename to lib/galaxy_test/selenium/test_tool_form.py diff --git a/test/selenium_tests/test_uploads.py b/lib/galaxy_test/selenium/test_uploads.py similarity index 100% rename from test/selenium_tests/test_uploads.py rename to lib/galaxy_test/selenium/test_uploads.py diff --git a/test/selenium_tests/test_workflow_editor.py b/lib/galaxy_test/selenium/test_workflow_editor.py similarity index 100% rename from test/selenium_tests/test_workflow_editor.py rename to lib/galaxy_test/selenium/test_workflow_editor.py diff --git a/test/selenium_tests/test_workflow_management.py b/lib/galaxy_test/selenium/test_workflow_management.py similarity index 100% rename from test/selenium_tests/test_workflow_management.py rename to lib/galaxy_test/selenium/test_workflow_management.py diff --git a/test/selenium_tests/test_workflow_run.py b/lib/galaxy_test/selenium/test_workflow_run.py similarity index 100% rename from test/selenium_tests/test_workflow_run.py rename to lib/galaxy_test/selenium/test_workflow_run.py diff --git a/test/shed_functional/__init__.py b/lib/tool_shed/test/__init__.py similarity index 100% rename from test/shed_functional/__init__.py rename to lib/tool_shed/test/__init__.py diff --git a/test/shed_functional/base/__init__.py b/lib/tool_shed/test/base/__init__.py similarity index 100% rename from test/shed_functional/base/__init__.py rename to lib/tool_shed/test/base/__init__.py diff --git a/test/shed_functional/base/common.py b/lib/tool_shed/test/base/common.py similarity index 100% rename from test/shed_functional/base/common.py rename to lib/tool_shed/test/base/common.py diff --git a/test/shed_functional/base/test_db_util.py b/lib/tool_shed/test/base/test_db_util.py similarity index 100% rename from test/shed_functional/base/test_db_util.py rename to lib/tool_shed/test/base/test_db_util.py diff --git a/test/shed_functional/base/twilltestcase.py b/lib/tool_shed/test/base/twilltestcase.py similarity index 100% rename from test/shed_functional/base/twilltestcase.py rename to lib/tool_shed/test/base/twilltestcase.py diff --git a/test/shed_functional/functional/__init__.py b/lib/tool_shed/test/functional/__init__.py similarity index 100% rename from test/shed_functional/functional/__init__.py rename to lib/tool_shed/test/functional/__init__.py diff --git a/test/shed_functional/functional/test_0000_basic_repository_features.py b/lib/tool_shed/test/functional/test_0000_basic_repository_features.py similarity index 99% rename from test/shed_functional/functional/test_0000_basic_repository_features.py rename to lib/tool_shed/test/functional/test_0000_basic_repository_features.py index fd49bb34e53..bfabe43b64c 100644 --- a/test/shed_functional/functional/test_0000_basic_repository_features.py +++ b/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" diff --git a/test/shed_functional/functional/test_0010_repository_with_tool_dependencies.py b/lib/tool_shed/test/functional/test_0010_repository_with_tool_dependencies.py similarity index 99% rename from test/shed_functional/functional/test_0010_repository_with_tool_dependencies.py rename to lib/tool_shed/test/functional/test_0010_repository_with_tool_dependencies.py index 032c7550b05..ced9b7d7d68 100644 --- a/test/shed_functional/functional/test_0010_repository_with_tool_dependencies.py +++ b/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" diff --git a/test/shed_functional/functional/test_0020_basic_repository_dependencies.py b/lib/tool_shed/test/functional/test_0020_basic_repository_dependencies.py similarity index 98% rename from test/shed_functional/functional/test_0020_basic_repository_dependencies.py rename to lib/tool_shed/test/functional/test_0020_basic_repository_dependencies.py index 136943910e7..2d1c5a91f96 100644 --- a/test/shed_functional/functional/test_0020_basic_repository_dependencies.py +++ b/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." diff --git a/test/shed_functional/functional/test_0030_repository_dependency_revisions.py b/lib/tool_shed/test/functional/test_0030_repository_dependency_revisions.py similarity index 99% rename from test/shed_functional/functional/test_0030_repository_dependency_revisions.py rename to lib/tool_shed/test/functional/test_0030_repository_dependency_revisions.py index 06de82464d7..a66230a7142 100644 --- a/test/shed_functional/functional/test_0030_repository_dependency_revisions.py +++ b/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." diff --git a/test/shed_functional/functional/test_0040_repository_circular_dependencies.py b/lib/tool_shed/test/functional/test_0040_repository_circular_dependencies.py similarity index 99% rename from test/shed_functional/functional/test_0040_repository_circular_dependencies.py rename to lib/tool_shed/test/functional/test_0040_repository_circular_dependencies.py index 94d57ae43dd..bbfc34bf38e 100644 --- a/test/shed_functional/functional/test_0040_repository_circular_dependencies.py +++ b/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" diff --git a/test/shed_functional/functional/test_0050_circular_dependencies_4_levels.py b/lib/tool_shed/test/functional/test_0050_circular_dependencies_4_levels.py similarity index 99% rename from test/shed_functional/functional/test_0050_circular_dependencies_4_levels.py rename to lib/tool_shed/test/functional/test_0050_circular_dependencies_4_levels.py index 22120886e36..1224d69372c 100644 --- a/test/shed_functional/functional/test_0050_circular_dependencies_4_levels.py +++ b/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" diff --git a/test/shed_functional/functional/test_0060_workflows.py b/lib/tool_shed/test/functional/test_0060_workflows.py similarity index 99% rename from test/shed_functional/functional/test_0060_workflows.py rename to lib/tool_shed/test/functional/test_0060_workflows.py index 0f3d5cde4a8..9aba5348aec 100644 --- a/test/shed_functional/functional/test_0060_workflows.py +++ b/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" diff --git a/test/shed_functional/functional/test_0070_invalid_tool.py b/lib/tool_shed/test/functional/test_0070_invalid_tool.py similarity index 98% rename from test/shed_functional/functional/test_0070_invalid_tool.py rename to lib/tool_shed/test/functional/test_0070_invalid_tool.py index 2755f63dd17..dc5f3e1256f 100644 --- a/test/shed_functional/functional/test_0070_invalid_tool.py +++ b/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" diff --git a/test/shed_functional/functional/test_0080_advanced_circular_dependencies.py b/lib/tool_shed/test/functional/test_0080_advanced_circular_dependencies.py similarity index 98% rename from test/shed_functional/functional/test_0080_advanced_circular_dependencies.py rename to lib/tool_shed/test/functional/test_0080_advanced_circular_dependencies.py index 9a2a9225c0c..b38acdb1c77 100644 --- a/test/shed_functional/functional/test_0080_advanced_circular_dependencies.py +++ b/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" diff --git a/test/shed_functional/functional/test_0090_tool_search.py b/lib/tool_shed/test/functional/test_0090_tool_search.py similarity index 99% rename from test/shed_functional/functional/test_0090_tool_search.py rename to lib/tool_shed/test/functional/test_0090_tool_search.py index e42dc30bae0..b7b43891ee0 100644 --- a/test/shed_functional/functional/test_0090_tool_search.py +++ b/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" diff --git a/test/shed_functional/functional/test_0100_complex_repository_dependencies.py b/lib/tool_shed/test/functional/test_0100_complex_repository_dependencies.py similarity index 99% rename from test/shed_functional/functional/test_0100_complex_repository_dependencies.py rename to lib/tool_shed/test/functional/test_0100_complex_repository_dependencies.py index b71aa946c4a..c6825812ea3 100644 --- a/test/shed_functional/functional/test_0100_complex_repository_dependencies.py +++ b/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__) diff --git a/test/shed_functional/functional/test_0110_invalid_simple_repository_dependencies.py b/lib/tool_shed/test/functional/test_0110_invalid_simple_repository_dependencies.py similarity index 99% rename from test/shed_functional/functional/test_0110_invalid_simple_repository_dependencies.py rename to lib/tool_shed/test/functional/test_0110_invalid_simple_repository_dependencies.py index f1a4928545c..482679ea2d6 100644 --- a/test/shed_functional/functional/test_0110_invalid_simple_repository_dependencies.py +++ b/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." diff --git a/test/shed_functional/functional/test_0120_simple_repository_dependency_multiple_owners.py b/lib/tool_shed/test/functional/test_0120_simple_repository_dependency_multiple_owners.py similarity index 99% rename from test/shed_functional/functional/test_0120_simple_repository_dependency_multiple_owners.py rename to lib/tool_shed/test/functional/test_0120_simple_repository_dependency_multiple_owners.py index 58e85750fab..cf51bbd2df5 100644 --- a/test/shed_functional/functional/test_0120_simple_repository_dependency_multiple_owners.py +++ b/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' diff --git a/test/shed_functional/functional/test_0130_datatype_converters.py b/lib/tool_shed/test/functional/test_0130_datatype_converters.py similarity index 98% rename from test/shed_functional/functional/test_0130_datatype_converters.py rename to lib/tool_shed/test/functional/test_0130_datatype_converters.py index 7462beafe1e..baf3cc2c626 100644 --- a/test/shed_functional/functional/test_0130_datatype_converters.py +++ b/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" diff --git a/test/shed_functional/functional/test_0140_tool_help_images.py b/lib/tool_shed/test/functional/test_0140_tool_help_images.py similarity index 98% rename from test/shed_functional/functional/test_0140_tool_help_images.py rename to lib/tool_shed/test/functional/test_0140_tool_help_images.py index 9f52ca5a221..f99cee4e87a 100644 --- a/test/shed_functional/functional/test_0140_tool_help_images.py +++ b/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__) diff --git a/test/shed_functional/functional/test_0150_prior_installation_required.py b/lib/tool_shed/test/functional/test_0150_prior_installation_required.py similarity index 98% rename from test/shed_functional/functional/test_0150_prior_installation_required.py rename to lib/tool_shed/test/functional/test_0150_prior_installation_required.py index 1d787fda498..e3cb0fcf993 100644 --- a/test/shed_functional/functional/test_0150_prior_installation_required.py +++ b/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" diff --git a/test/shed_functional/functional/test_0160_circular_prior_installation_required.py b/lib/tool_shed/test/functional/test_0160_circular_prior_installation_required.py similarity index 99% rename from test/shed_functional/functional/test_0160_circular_prior_installation_required.py rename to lib/tool_shed/test/functional/test_0160_circular_prior_installation_required.py index 3d84b9fc6bd..78b71a85202 100644 --- a/test/shed_functional/functional/test_0160_circular_prior_installation_required.py +++ b/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" diff --git a/test/shed_functional/functional/test_0170_complex_prior_installation_required.py b/lib/tool_shed/test/functional/test_0170_complex_prior_installation_required.py similarity index 99% rename from test/shed_functional/functional/test_0170_complex_prior_installation_required.py rename to lib/tool_shed/test/functional/test_0170_complex_prior_installation_required.py index b3540857704..6fbd8a238bb 100644 --- a/test/shed_functional/functional/test_0170_complex_prior_installation_required.py +++ b/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." diff --git a/test/shed_functional/functional/test_0300_reset_all_metadata.py b/lib/tool_shed/test/functional/test_0300_reset_all_metadata.py similarity index 99% rename from test/shed_functional/functional/test_0300_reset_all_metadata.py rename to lib/tool_shed/test/functional/test_0300_reset_all_metadata.py index 02183ff7df3..9d5b0c64613 100644 --- a/test/shed_functional/functional/test_0300_reset_all_metadata.py +++ b/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." diff --git a/test/shed_functional/functional/test_0310_hg_api_features.py b/lib/tool_shed/test/functional/test_0310_hg_api_features.py similarity index 98% rename from test/shed_functional/functional/test_0310_hg_api_features.py rename to lib/tool_shed/test/functional/test_0310_hg_api_features.py index 8aa0aef4305..d101d308a83 100644 --- a/test/shed_functional/functional/test_0310_hg_api_features.py +++ b/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__) diff --git a/test/shed_functional/functional/test_0400_repository_component_reviews.py b/lib/tool_shed/test/functional/test_0400_repository_component_reviews.py similarity index 99% rename from test/shed_functional/functional/test_0400_repository_component_reviews.py rename to lib/tool_shed/test/functional/test_0400_repository_component_reviews.py index 71a439d4cde..6d3910a6f3d 100644 --- a/test/shed_functional/functional/test_0400_repository_component_reviews.py +++ b/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' diff --git a/test/shed_functional/functional/test_0410_repository_component_review_access_control.py b/lib/tool_shed/test/functional/test_0410_repository_component_review_access_control.py similarity index 99% rename from test/shed_functional/functional/test_0410_repository_component_review_access_control.py rename to lib/tool_shed/test/functional/test_0410_repository_component_review_access_control.py index d2628f0d4c9..606e04516ec 100644 --- a/test/shed_functional/functional/test_0410_repository_component_review_access_control.py +++ b/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' diff --git a/test/shed_functional/functional/test_0420_citable_urls_for_repositories.py b/lib/tool_shed/test/functional/test_0420_citable_urls_for_repositories.py similarity index 99% rename from test/shed_functional/functional/test_0420_citable_urls_for_repositories.py rename to lib/tool_shed/test/functional/test_0420_citable_urls_for_repositories.py index 3fb02e1b9e2..e35f562cb69 100644 --- a/test/shed_functional/functional/test_0420_citable_urls_for_repositories.py +++ b/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__) diff --git a/test/shed_functional/functional/test_0430_browse_utilities.py b/lib/tool_shed/test/functional/test_0430_browse_utilities.py similarity index 99% rename from test/shed_functional/functional/test_0430_browse_utilities.py rename to lib/tool_shed/test/functional/test_0430_browse_utilities.py index fbd36a30b15..77171a37af6 100644 --- a/test/shed_functional/functional/test_0430_browse_utilities.py +++ b/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__) diff --git a/test/shed_functional/functional/test_0440_deleting_dependency_definitions.py b/lib/tool_shed/test/functional/test_0440_deleting_dependency_definitions.py similarity index 99% rename from test/shed_functional/functional/test_0440_deleting_dependency_definitions.py rename to lib/tool_shed/test/functional/test_0440_deleting_dependency_definitions.py index e18240ab666..f182b205da7 100644 --- a/test/shed_functional/functional/test_0440_deleting_dependency_definitions.py +++ b/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" diff --git a/test/shed_functional/functional/test_0460_upload_to_repository.py b/lib/tool_shed/test/functional/test_0460_upload_to_repository.py similarity index 99% rename from test/shed_functional/functional/test_0460_upload_to_repository.py rename to lib/tool_shed/test/functional/test_0460_upload_to_repository.py index 4f160b2526e..a7d4c064fca 100644 --- a/test/shed_functional/functional/test_0460_upload_to_repository.py +++ b/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__) diff --git a/test/shed_functional/functional/test_0470_tool_dependency_repository_type.py b/lib/tool_shed/test/functional/test_0470_tool_dependency_repository_type.py similarity index 99% rename from test/shed_functional/functional/test_0470_tool_dependency_repository_type.py rename to lib/tool_shed/test/functional/test_0470_tool_dependency_repository_type.py index 81e9ea8d821..a3addd0b132 100644 --- a/test/shed_functional/functional/test_0470_tool_dependency_repository_type.py +++ b/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__) diff --git a/test/shed_functional/functional/test_0480_tool_dependency_xml_verification.py b/lib/tool_shed/test/functional/test_0480_tool_dependency_xml_verification.py similarity index 98% rename from test/shed_functional/functional/test_0480_tool_dependency_xml_verification.py rename to lib/tool_shed/test/functional/test_0480_tool_dependency_xml_verification.py index 082431222b4..864257ccc64 100644 --- a/test/shed_functional/functional/test_0480_tool_dependency_xml_verification.py +++ b/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__) diff --git a/test/shed_functional/functional/test_0490_export_import_repositories.py b/lib/tool_shed/test/functional/test_0490_export_import_repositories.py similarity index 98% rename from test/shed_functional/functional/test_0490_export_import_repositories.py rename to lib/tool_shed/test/functional/test_0490_export_import_repositories.py index a3b6edbee07..fc5d6dade67 100644 --- a/test/shed_functional/functional/test_0490_export_import_repositories.py +++ b/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__) diff --git a/test/shed_functional/functional/test_0500_export_repository_simple_dependency.py b/lib/tool_shed/test/functional/test_0500_export_repository_simple_dependency.py similarity index 98% rename from test/shed_functional/functional/test_0500_export_repository_simple_dependency.py rename to lib/tool_shed/test/functional/test_0500_export_repository_simple_dependency.py index c56a1b98a94..e54f9f9784c 100644 --- a/test/shed_functional/functional/test_0500_export_repository_simple_dependency.py +++ b/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__) diff --git a/test/shed_functional/functional/test_0510_export_import_repository_complex_dependencies.py b/lib/tool_shed/test/functional/test_0510_export_import_repository_complex_dependencies.py similarity index 98% rename from test/shed_functional/functional/test_0510_export_import_repository_complex_dependencies.py rename to lib/tool_shed/test/functional/test_0510_export_import_repository_complex_dependencies.py index d0f424b8208..ae0d5cbc4b0 100644 --- a/test/shed_functional/functional/test_0510_export_import_repository_complex_dependencies.py +++ b/lib/tool_shed/test/functional/test_0510_export_import_repository_complex_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__) diff --git a/test/shed_functional/functional/test_0520_import_export_circular_dependencies.py b/lib/tool_shed/test/functional/test_0520_import_export_circular_dependencies.py similarity index 98% rename from test/shed_functional/functional/test_0520_import_export_circular_dependencies.py rename to lib/tool_shed/test/functional/test_0520_import_export_circular_dependencies.py index fbc123e95f3..85fbc1402c3 100644 --- a/test/shed_functional/functional/test_0520_import_export_circular_dependencies.py +++ b/lib/tool_shed/test/functional/test_0520_import_export_circular_dependencies.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__) diff --git a/test/shed_functional/functional/test_0530_repository_admin_feature.py b/lib/tool_shed/test/functional/test_0530_repository_admin_feature.py similarity index 99% rename from test/shed_functional/functional/test_0530_repository_admin_feature.py rename to lib/tool_shed/test/functional/test_0530_repository_admin_feature.py index 3a11bdff16b..193619c60e9 100644 --- a/test/shed_functional/functional/test_0530_repository_admin_feature.py +++ b/lib/tool_shed/test/functional/test_0530_repository_admin_feature.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__) diff --git a/test/shed_functional/functional/test_0540_get_all_metadata_from_api.py b/lib/tool_shed/test/functional/test_0540_get_all_metadata_from_api.py similarity index 99% rename from test/shed_functional/functional/test_0540_get_all_metadata_from_api.py rename to lib/tool_shed/test/functional/test_0540_get_all_metadata_from_api.py index bb76935d698..5e1dd02d201 100644 --- a/test/shed_functional/functional/test_0540_get_all_metadata_from_api.py +++ b/lib/tool_shed/test/functional/test_0540_get_all_metadata_from_api.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__) diff --git a/test/shed_functional/functional/test_0550_metadata_updated_dependencies.py b/lib/tool_shed/test/functional/test_0550_metadata_updated_dependencies.py similarity index 99% rename from test/shed_functional/functional/test_0550_metadata_updated_dependencies.py rename to lib/tool_shed/test/functional/test_0550_metadata_updated_dependencies.py index 0edf4012d48..be1e8943840 100644 --- a/test/shed_functional/functional/test_0550_metadata_updated_dependencies.py +++ b/lib/tool_shed/test/functional/test_0550_metadata_updated_dependencies.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__) diff --git a/test/shed_functional/functional/test_1000_install_basic_repository.py b/lib/tool_shed/test/functional/test_1000_install_basic_repository.py similarity index 99% rename from test/shed_functional/functional/test_1000_install_basic_repository.py rename to lib/tool_shed/test/functional/test_1000_install_basic_repository.py index e44f61a2fcf..17ce8fdf9f0 100644 --- a/test/shed_functional/functional/test_1000_install_basic_repository.py +++ b/lib/tool_shed/test/functional/test_1000_install_basic_repository.py @@ -1,4 +1,4 @@ -from shed_functional.base.twilltestcase import common, ShedTwillTestCase +from ..base.twilltestcase import common, ShedTwillTestCase class BasicToolShedFeatures(ShedTwillTestCase): diff --git a/test/shed_functional/functional/test_1010_install_repository_with_tool_dependencies.py b/lib/tool_shed/test/functional/test_1010_install_repository_with_tool_dependencies.py similarity index 99% rename from test/shed_functional/functional/test_1010_install_repository_with_tool_dependencies.py rename to lib/tool_shed/test/functional/test_1010_install_repository_with_tool_dependencies.py index 6d009c00c62..7c480d46c87 100644 --- a/test/shed_functional/functional/test_1010_install_repository_with_tool_dependencies.py +++ b/lib/tool_shed/test/functional/test_1010_install_repository_with_tool_dependencies.py @@ -1,7 +1,7 @@ import logging 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" diff --git a/test/shed_functional/functional/test_1020_install_repository_with_repository_dependencies.py b/lib/tool_shed/test/functional/test_1020_install_repository_with_repository_dependencies.py similarity index 99% rename from test/shed_functional/functional/test_1020_install_repository_with_repository_dependencies.py rename to lib/tool_shed/test/functional/test_1020_install_repository_with_repository_dependencies.py index d7d3cafa171..a502a73442c 100644 --- a/test/shed_functional/functional/test_1020_install_repository_with_repository_dependencies.py +++ b/lib/tool_shed/test/functional/test_1020_install_repository_with_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." diff --git a/test/shed_functional/functional/test_1030_install_repository_with_dependency_revisions.py b/lib/tool_shed/test/functional/test_1030_install_repository_with_dependency_revisions.py similarity index 99% rename from test/shed_functional/functional/test_1030_install_repository_with_dependency_revisions.py rename to lib/tool_shed/test/functional/test_1030_install_repository_with_dependency_revisions.py index aac2205f862..1d0894b0786 100644 --- a/test/shed_functional/functional/test_1030_install_repository_with_dependency_revisions.py +++ b/lib/tool_shed/test/functional/test_1030_install_repository_with_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." diff --git a/test/shed_functional/functional/test_1040_install_repository_basic_circular_dependencies.py b/lib/tool_shed/test/functional/test_1040_install_repository_basic_circular_dependencies.py similarity index 99% rename from test/shed_functional/functional/test_1040_install_repository_basic_circular_dependencies.py rename to lib/tool_shed/test/functional/test_1040_install_repository_basic_circular_dependencies.py index c31c52cee51..f390f1a42b5 100644 --- a/test/shed_functional/functional/test_1040_install_repository_basic_circular_dependencies.py +++ b/lib/tool_shed/test/functional/test_1040_install_repository_basic_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" diff --git a/test/shed_functional/functional/test_1050_circular_dependencies_4_levels.py b/lib/tool_shed/test/functional/test_1050_circular_dependencies_4_levels.py similarity index 99% rename from test/shed_functional/functional/test_1050_circular_dependencies_4_levels.py rename to lib/tool_shed/test/functional/test_1050_circular_dependencies_4_levels.py index 915ec3e21f1..e8b0c64dcd2 100644 --- a/test/shed_functional/functional/test_1050_circular_dependencies_4_levels.py +++ b/lib/tool_shed/test/functional/test_1050_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" diff --git a/test/shed_functional/functional/test_1060_install_repository_with_workflow.py b/lib/tool_shed/test/functional/test_1060_install_repository_with_workflow.py similarity index 99% rename from test/shed_functional/functional/test_1060_install_repository_with_workflow.py rename to lib/tool_shed/test/functional/test_1060_install_repository_with_workflow.py index ff6e94435d0..0eea24c3710 100644 --- a/test/shed_functional/functional/test_1060_install_repository_with_workflow.py +++ b/lib/tool_shed/test/functional/test_1060_install_repository_with_workflow.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" diff --git a/test/shed_functional/functional/test_1070_invalid_tool.py b/lib/tool_shed/test/functional/test_1070_invalid_tool.py similarity index 98% rename from test/shed_functional/functional/test_1070_invalid_tool.py rename to lib/tool_shed/test/functional/test_1070_invalid_tool.py index bf8e3aad69f..cf224d01976 100644 --- a/test/shed_functional/functional/test_1070_invalid_tool.py +++ b/lib/tool_shed/test/functional/test_1070_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" diff --git a/test/shed_functional/functional/test_1080_advanced_circular_dependency_installation.py b/lib/tool_shed/test/functional/test_1080_advanced_circular_dependency_installation.py similarity index 99% rename from test/shed_functional/functional/test_1080_advanced_circular_dependency_installation.py rename to lib/tool_shed/test/functional/test_1080_advanced_circular_dependency_installation.py index 90004bc0477..f0d5133fa56 100644 --- a/test/shed_functional/functional/test_1080_advanced_circular_dependency_installation.py +++ b/lib/tool_shed/test/functional/test_1080_advanced_circular_dependency_installation.py @@ -1,6 +1,6 @@ import logging -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" diff --git a/test/shed_functional/functional/test_1090_repository_dependency_handling.py b/lib/tool_shed/test/functional/test_1090_repository_dependency_handling.py similarity index 99% rename from test/shed_functional/functional/test_1090_repository_dependency_handling.py rename to lib/tool_shed/test/functional/test_1090_repository_dependency_handling.py index 5f2b4fdeb32..a8ddffb3935 100644 --- a/test/shed_functional/functional/test_1090_repository_dependency_handling.py +++ b/lib/tool_shed/test/functional/test_1090_repository_dependency_handling.py @@ -1,6 +1,6 @@ import logging -from shed_functional.base.twilltestcase import common, ShedTwillTestCase +from ..base.twilltestcase import common, ShedTwillTestCase column_repository_name = 'column_maker_1085' column_repository_description = "Add column" diff --git a/test/shed_functional/functional/test_1100_install_updated_repository_dependencies.py b/lib/tool_shed/test/functional/test_1100_install_updated_repository_dependencies.py similarity index 99% rename from test/shed_functional/functional/test_1100_install_updated_repository_dependencies.py rename to lib/tool_shed/test/functional/test_1100_install_updated_repository_dependencies.py index aff4395a302..7af2ef499e1 100644 --- a/test/shed_functional/functional/test_1100_install_updated_repository_dependencies.py +++ b/lib/tool_shed/test/functional/test_1100_install_updated_repository_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_1087' column_repository_description = "Add column" diff --git a/test/shed_functional/functional/test_1110_install_tool_from_tool_search.py b/lib/tool_shed/test/functional/test_1110_install_tool_from_tool_search.py similarity index 99% rename from test/shed_functional/functional/test_1110_install_tool_from_tool_search.py rename to lib/tool_shed/test/functional/test_1110_install_tool_from_tool_search.py index 6bb1b341c01..68761f1ec65 100644 --- a/test/shed_functional/functional/test_1110_install_tool_from_tool_search.py +++ b/lib/tool_shed/test/functional/test_1110_install_tool_from_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" diff --git a/test/shed_functional/functional/test_1120_install_repository_with_complex_dependencies.py b/lib/tool_shed/test/functional/test_1120_install_repository_with_complex_dependencies.py similarity index 99% rename from test/shed_functional/functional/test_1120_install_repository_with_complex_dependencies.py rename to lib/tool_shed/test/functional/test_1120_install_repository_with_complex_dependencies.py index 921056c4849..6bf2ef98986 100644 --- a/test/shed_functional/functional/test_1120_install_repository_with_complex_dependencies.py +++ b/lib/tool_shed/test/functional/test_1120_install_repository_with_complex_dependencies.py @@ -1,6 +1,6 @@ import os -from shed_functional.base.twilltestcase import common, ShedTwillTestCase +from ..base.twilltestcase import common, ShedTwillTestCase bwa_base_repository_name = 'bwa_base_repository_0100' bwa_base_repository_description = "BWA Base" diff --git a/test/shed_functional/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 similarity index 99% rename from test/shed_functional/functional/test_1130_install_repository_with_invalid_repository_dependency.py rename to lib/tool_shed/test/functional/test_1130_install_repository_with_invalid_repository_dependency.py index edb32f07dbd..5eab6c6bfe0 100644 --- a/test/shed_functional/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 @@ -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." diff --git a/test/shed_functional/functional/test_1140_simple_repository_dependency_multiple_owners.py b/lib/tool_shed/test/functional/test_1140_simple_repository_dependency_multiple_owners.py similarity index 99% rename from test/shed_functional/functional/test_1140_simple_repository_dependency_multiple_owners.py rename to lib/tool_shed/test/functional/test_1140_simple_repository_dependency_multiple_owners.py index eb0c7e0ace1..08af8f2c51a 100644 --- a/test/shed_functional/functional/test_1140_simple_repository_dependency_multiple_owners.py +++ b/lib/tool_shed/test/functional/test_1140_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' diff --git a/test/shed_functional/functional/test_1150_datatype_converters.py b/lib/tool_shed/test/functional/test_1150_datatype_converters.py similarity index 98% rename from test/shed_functional/functional/test_1150_datatype_converters.py rename to lib/tool_shed/test/functional/test_1150_datatype_converters.py index 59f6a629d69..2810bef4471 100644 --- a/test/shed_functional/functional/test_1150_datatype_converters.py +++ b/lib/tool_shed/test/functional/test_1150_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" diff --git a/test/shed_functional/functional/test_1160_tool_help_images.py b/lib/tool_shed/test/functional/test_1160_tool_help_images.py similarity index 98% rename from test/shed_functional/functional/test_1160_tool_help_images.py rename to lib/tool_shed/test/functional/test_1160_tool_help_images.py index 57ecda213da..5cdaf04d1e1 100644 --- a/test/shed_functional/functional/test_1160_tool_help_images.py +++ b/lib/tool_shed/test/functional/test_1160_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__) diff --git a/test/shed_functional/functional/test_1170_prior_installation_required.py b/lib/tool_shed/test/functional/test_1170_prior_installation_required.py similarity index 99% rename from test/shed_functional/functional/test_1170_prior_installation_required.py rename to lib/tool_shed/test/functional/test_1170_prior_installation_required.py index af1b2a2d0f2..0fa3ed5d710 100644 --- a/test/shed_functional/functional/test_1170_prior_installation_required.py +++ b/lib/tool_shed/test/functional/test_1170_prior_installation_required.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__) diff --git a/test/shed_functional/functional/test_1180_circular_prior_installation_required.py b/lib/tool_shed/test/functional/test_1180_circular_prior_installation_required.py similarity index 99% rename from test/shed_functional/functional/test_1180_circular_prior_installation_required.py rename to lib/tool_shed/test/functional/test_1180_circular_prior_installation_required.py index 0d1dd5ad159..74fad0b9dbb 100644 --- a/test/shed_functional/functional/test_1180_circular_prior_installation_required.py +++ b/lib/tool_shed/test/functional/test_1180_circular_prior_installation_required.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__) diff --git a/test/shed_functional/functional/test_1190_complex_prior_installation_required.py b/lib/tool_shed/test/functional/test_1190_complex_prior_installation_required.py similarity index 99% rename from test/shed_functional/functional/test_1190_complex_prior_installation_required.py rename to lib/tool_shed/test/functional/test_1190_complex_prior_installation_required.py index 043ccef4565..4059336332c 100644 --- a/test/shed_functional/functional/test_1190_complex_prior_installation_required.py +++ b/lib/tool_shed/test/functional/test_1190_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." diff --git a/test/shed_functional/functional/test_1200_uninstall_and_reinstall_basic_repository.py b/lib/tool_shed/test/functional/test_1200_uninstall_and_reinstall_basic_repository.py similarity index 99% rename from test/shed_functional/functional/test_1200_uninstall_and_reinstall_basic_repository.py rename to lib/tool_shed/test/functional/test_1200_uninstall_and_reinstall_basic_repository.py index 56ecdca98d7..cf50b847800 100644 --- a/test/shed_functional/functional/test_1200_uninstall_and_reinstall_basic_repository.py +++ b/lib/tool_shed/test/functional/test_1200_uninstall_and_reinstall_basic_repository.py @@ -1,4 +1,4 @@ -from shed_functional.base.twilltestcase import common, ShedTwillTestCase +from ..base.twilltestcase import common, ShedTwillTestCase class UninstallingAndReinstallingRepositories(ShedTwillTestCase): diff --git a/test/shed_functional/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 similarity index 99% rename from test/shed_functional/functional/test_1210_uninstall_reinstall_repository_with_tool_dependencies.py rename to lib/tool_shed/test/functional/test_1210_uninstall_reinstall_repository_with_tool_dependencies.py index 9ddca3a1c42..7111255c494 100644 --- a/test/shed_functional/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 @@ -1,6 +1,6 @@ import os -from shed_functional.base.twilltestcase import common, ShedTwillTestCase +from ..base.twilltestcase import common, ShedTwillTestCase class UninstallingAndReinstallingRepositories(ShedTwillTestCase): diff --git a/test/shed_functional/functional/test_1220_uninstall_reinstall_repository_with_repository_dependencies.py b/lib/tool_shed/test/functional/test_1220_uninstall_reinstall_repository_with_repository_dependencies.py similarity index 99% rename from test/shed_functional/functional/test_1220_uninstall_reinstall_repository_with_repository_dependencies.py rename to lib/tool_shed/test/functional/test_1220_uninstall_reinstall_repository_with_repository_dependencies.py index 01ff942f7ca..84637dbc3ee 100644 --- a/test/shed_functional/functional/test_1220_uninstall_reinstall_repository_with_repository_dependencies.py +++ b/lib/tool_shed/test/functional/test_1220_uninstall_reinstall_repository_with_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." diff --git a/test/shed_functional/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 similarity index 99% rename from test/shed_functional/functional/test_1230_uninstall_reinstall_repository_with_dependency_revisions.py rename to lib/tool_shed/test/functional/test_1230_uninstall_reinstall_repository_with_dependency_revisions.py index 01d36a79780..a2f3b21436e 100644 --- a/test/shed_functional/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 @@ -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." diff --git a/test/shed_functional/functional/test_1300_reset_all_metadata.py b/lib/tool_shed/test/functional/test_1300_reset_all_metadata.py similarity index 99% rename from test/shed_functional/functional/test_1300_reset_all_metadata.py rename to lib/tool_shed/test/functional/test_1300_reset_all_metadata.py index e53c82d78f7..88389b888c8 100644 --- a/test/shed_functional/functional/test_1300_reset_all_metadata.py +++ b/lib/tool_shed/test/functional/test_1300_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." diff --git a/test/shed_functional/functional/test_1400_review_migration_stages.py b/lib/tool_shed/test/functional/test_1400_review_migration_stages.py similarity index 97% rename from test/shed_functional/functional/test_1400_review_migration_stages.py rename to lib/tool_shed/test/functional/test_1400_review_migration_stages.py index 5433f77690b..8413101d43b 100644 --- a/test/shed_functional/functional/test_1400_review_migration_stages.py +++ b/lib/tool_shed/test/functional/test_1400_review_migration_stages.py @@ -1,4 +1,4 @@ -from shed_functional.base.twilltestcase import common, ShedTwillTestCase +from ..base.twilltestcase import common, ShedTwillTestCase class TestToolMigrationStages(ShedTwillTestCase): diff --git a/test/shed_functional/functional/test_1410_update_manager.py b/lib/tool_shed/test/functional/test_1410_update_manager.py similarity index 98% rename from test/shed_functional/functional/test_1410_update_manager.py rename to lib/tool_shed/test/functional/test_1410_update_manager.py index 3c449cf5d35..1de705e407f 100644 --- a/test/shed_functional/functional/test_1410_update_manager.py +++ b/lib/tool_shed/test/functional/test_1410_update_manager.py @@ -1,7 +1,7 @@ import logging import time -from shed_functional.base.twilltestcase import common, ShedTwillTestCase +from ..base.twilltestcase import common, ShedTwillTestCase log = logging.getLogger(__name__) diff --git a/test/shed_functional/functional/test_1420_tool_dependency_environment_inheritance.py b/lib/tool_shed/test/functional/test_1420_tool_dependency_environment_inheritance.py similarity index 99% rename from test/shed_functional/functional/test_1420_tool_dependency_environment_inheritance.py rename to lib/tool_shed/test/functional/test_1420_tool_dependency_environment_inheritance.py index d97fc68ad40..7b1eaa8c7c0 100644 --- a/test/shed_functional/functional/test_1420_tool_dependency_environment_inheritance.py +++ b/lib/tool_shed/test/functional/test_1420_tool_dependency_environment_inheritance.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__) diff --git a/test/shed_functional/functional/test_1430_repair_installed_repository.py b/lib/tool_shed/test/functional/test_1430_repair_installed_repository.py similarity index 99% rename from test/shed_functional/functional/test_1430_repair_installed_repository.py rename to lib/tool_shed/test/functional/test_1430_repair_installed_repository.py index d9b9aedcc62..b5dbd316ebd 100644 --- a/test/shed_functional/functional/test_1430_repair_installed_repository.py +++ b/lib/tool_shed/test/functional/test_1430_repair_installed_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__) diff --git a/test/shed_functional/functional/test_1440_missing_env_sh_files.py b/lib/tool_shed/test/functional/test_1440_missing_env_sh_files.py similarity index 99% rename from test/shed_functional/functional/test_1440_missing_env_sh_files.py rename to lib/tool_shed/test/functional/test_1440_missing_env_sh_files.py index 243cafff117..05f47ab1feb 100644 --- a/test/shed_functional/functional/test_1440_missing_env_sh_files.py +++ b/lib/tool_shed/test/functional/test_1440_missing_env_sh_files.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__) diff --git a/test/shed_functional/functional/test_1450_installing_datatypes_sniffers.py b/lib/tool_shed/test/functional/test_1450_installing_datatypes_sniffers.py similarity index 99% rename from test/shed_functional/functional/test_1450_installing_datatypes_sniffers.py rename to lib/tool_shed/test/functional/test_1450_installing_datatypes_sniffers.py index 50dc57fce86..d4655ca486a 100644 --- a/test/shed_functional/functional/test_1450_installing_datatypes_sniffers.py +++ b/lib/tool_shed/test/functional/test_1450_installing_datatypes_sniffers.py @@ -1,4 +1,4 @@ -from shed_functional.base.twilltestcase import common, ShedTwillTestCase +from ..base.twilltestcase import common, ShedTwillTestCase repository_name = 'proteomics_datatypes_1450' repository_description = "Proteomics datatypes" diff --git a/test/shed_functional/functional/test_1460_data_managers.py b/lib/tool_shed/test/functional/test_1460_data_managers.py similarity index 98% rename from test/shed_functional/functional/test_1460_data_managers.py rename to lib/tool_shed/test/functional/test_1460_data_managers.py index 268c5f32732..d42e786a777 100644 --- a/test/shed_functional/functional/test_1460_data_managers.py +++ b/lib/tool_shed/test/functional/test_1460_data_managers.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__) diff --git a/test/shed_functional/functional/test_1470_updating_installed_repositories.py b/lib/tool_shed/test/functional/test_1470_updating_installed_repositories.py similarity index 99% rename from test/shed_functional/functional/test_1470_updating_installed_repositories.py rename to lib/tool_shed/test/functional/test_1470_updating_installed_repositories.py index 5acac14a69e..c52c779861f 100644 --- a/test/shed_functional/functional/test_1470_updating_installed_repositories.py +++ b/lib/tool_shed/test/functional/test_1470_updating_installed_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__) diff --git a/test/shed_functional/functional_tests.py b/lib/tool_shed/test/functional_tests.py similarity index 98% rename from test/shed_functional/functional_tests.py rename to lib/tool_shed/test/functional_tests.py index 14c0a63ac5f..2356a15c469 100644 --- a/test/shed_functional/functional_tests.py +++ b/lib/tool_shed/test/functional_tests.py @@ -10,9 +10,9 @@ import string import sys import tempfile -galaxy_root = os.path.abspath(os.path.join(os.path.dirname(__file__), os.path.pardir, os.path.pardir)) +galaxy_root = os.path.abspath(os.path.join(os.path.dirname(__file__), os.path.pardir, os.path.pardir, os.path.pardir)) # Need to remove this directory from sys.path -sys.path[0:1] = [os.path.join(galaxy_root, "lib"), os.path.join(galaxy_root, "test")] +sys.path[0:1] = [os.path.join(galaxy_root, "lib")] # This is for the tool shed application. from galaxy.web import buildapp as galaxybuildapp diff --git a/test/shed_functional/test_data/0460_files/repository_dependencies.xml b/lib/tool_shed/test/test_data/0460_files/repository_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/0460_files/repository_dependencies.xml rename to lib/tool_shed/test/test_data/0460_files/repository_dependencies.xml diff --git a/test/shed_functional/test_data/0460_files/repository_dependencies_in_root.tar b/lib/tool_shed/test/test_data/0460_files/repository_dependencies_in_root.tar similarity index 100% rename from test/shed_functional/test_data/0460_files/repository_dependencies_in_root.tar rename to lib/tool_shed/test/test_data/0460_files/repository_dependencies_in_root.tar diff --git a/test/shed_functional/test_data/0460_files/repository_dependencies_in_subfolder.tar b/lib/tool_shed/test/test_data/0460_files/repository_dependencies_in_subfolder.tar similarity index 100% rename from test/shed_functional/test_data/0460_files/repository_dependencies_in_subfolder.tar rename to lib/tool_shed/test/test_data/0460_files/repository_dependencies_in_subfolder.tar diff --git a/test/shed_functional/test_data/0460_files/tool_dependencies.xml b/lib/tool_shed/test/test_data/0460_files/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/0460_files/tool_dependencies.xml rename to lib/tool_shed/test/test_data/0460_files/tool_dependencies.xml diff --git a/test/shed_functional/test_data/0460_files/tool_dependencies_in_root.tar b/lib/tool_shed/test/test_data/0460_files/tool_dependencies_in_root.tar similarity index 100% rename from test/shed_functional/test_data/0460_files/tool_dependencies_in_root.tar rename to lib/tool_shed/test/test_data/0460_files/tool_dependencies_in_root.tar diff --git a/test/shed_functional/test_data/0460_files/tool_dependencies_in_subfolder.tar b/lib/tool_shed/test/test_data/0460_files/tool_dependencies_in_subfolder.tar similarity index 100% rename from test/shed_functional/test_data/0460_files/tool_dependencies_in_subfolder.tar rename to lib/tool_shed/test/test_data/0460_files/tool_dependencies_in_subfolder.tar diff --git a/test/shed_functional/test_data/0480_files/tool_dependencies.xml b/lib/tool_shed/test/test_data/0480_files/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/0480_files/tool_dependencies.xml rename to lib/tool_shed/test/test_data/0480_files/tool_dependencies.xml diff --git a/test/shed_functional/test_data/0540_files/column_maker/column_maker.tar b/lib/tool_shed/test/test_data/0540_files/column_maker/column_maker.tar similarity index 100% rename from test/shed_functional/test_data/0540_files/column_maker/column_maker.tar rename to lib/tool_shed/test/test_data/0540_files/column_maker/column_maker.tar diff --git a/test/shed_functional/test_data/0540_files/column_maker/repository_dependencies.xml b/lib/tool_shed/test/test_data/0540_files/column_maker/repository_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/0540_files/column_maker/repository_dependencies.xml rename to lib/tool_shed/test/test_data/0540_files/column_maker/repository_dependencies.xml diff --git a/test/shed_functional/test_data/0540_files/convert_chars/convert_chars.tar b/lib/tool_shed/test/test_data/0540_files/convert_chars/convert_chars.tar similarity index 100% rename from test/shed_functional/test_data/0540_files/convert_chars/convert_chars.tar rename to lib/tool_shed/test/test_data/0540_files/convert_chars/convert_chars.tar diff --git a/test/shed_functional/test_data/0540_files/convert_chars/tool_dependencies.xml b/lib/tool_shed/test/test_data/0540_files/convert_chars/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/0540_files/convert_chars/tool_dependencies.xml rename to lib/tool_shed/test/test_data/0540_files/convert_chars/tool_dependencies.xml diff --git a/test/shed_functional/test_data/0540_files/package_bwa/tool_dependencies.xml b/lib/tool_shed/test/test_data/0540_files/package_bwa/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/0540_files/package_bwa/tool_dependencies.xml rename to lib/tool_shed/test/test_data/0540_files/package_bwa/tool_dependencies.xml diff --git a/test/shed_functional/test_data/0550_files/filtering_1.0.tgz b/lib/tool_shed/test/test_data/0550_files/filtering_1.0.tgz similarity index 100% rename from test/shed_functional/test_data/0550_files/filtering_1.0.tgz rename to lib/tool_shed/test/test_data/0550_files/filtering_1.0.tgz diff --git a/test/shed_functional/test_data/0550_files/package_freebayes_1_0550.tgz b/lib/tool_shed/test/test_data/0550_files/package_freebayes_1_0550.tgz similarity index 100% rename from test/shed_functional/test_data/0550_files/package_freebayes_1_0550.tgz rename to lib/tool_shed/test/test_data/0550_files/package_freebayes_1_0550.tgz diff --git a/test/shed_functional/test_data/0550_files/package_freebayes_2_0550.tgz b/lib/tool_shed/test/test_data/0550_files/package_freebayes_2_0550.tgz similarity index 100% rename from test/shed_functional/test_data/0550_files/package_freebayes_2_0550.tgz rename to lib/tool_shed/test/test_data/0550_files/package_freebayes_2_0550.tgz diff --git a/test/shed_functional/test_data/0550_files/package_samtools_1_0550.tgz b/lib/tool_shed/test/test_data/0550_files/package_samtools_1_0550.tgz similarity index 100% rename from test/shed_functional/test_data/0550_files/package_samtools_1_0550.tgz rename to lib/tool_shed/test/test_data/0550_files/package_samtools_1_0550.tgz diff --git a/test/shed_functional/test_data/0550_files/package_samtools_2_0550.tgz b/lib/tool_shed/test/test_data/0550_files/package_samtools_2_0550.tgz similarity index 100% rename from test/shed_functional/test_data/0550_files/package_samtools_2_0550.tgz rename to lib/tool_shed/test/test_data/0550_files/package_samtools_2_0550.tgz diff --git a/test/shed_functional/test_data/0550_files/temp/tool_dependencies.xml b/lib/tool_shed/test/test_data/0550_files/temp/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/0550_files/temp/tool_dependencies.xml rename to lib/tool_shed/test/test_data/0550_files/temp/tool_dependencies.xml diff --git a/test/shed_functional/test_data/1420_files/binary_tarballs/atlas.tar b/lib/tool_shed/test/test_data/1420_files/binary_tarballs/atlas.tar similarity index 100% rename from test/shed_functional/test_data/1420_files/binary_tarballs/atlas.tar rename to lib/tool_shed/test/test_data/1420_files/binary_tarballs/atlas.tar diff --git a/test/shed_functional/test_data/1420_files/binary_tarballs/boost.tar b/lib/tool_shed/test/test_data/1420_files/binary_tarballs/boost.tar similarity index 100% rename from test/shed_functional/test_data/1420_files/binary_tarballs/boost.tar rename to lib/tool_shed/test/test_data/1420_files/binary_tarballs/boost.tar diff --git a/test/shed_functional/test_data/1420_files/binary_tarballs/bzlib.tar b/lib/tool_shed/test/test_data/1420_files/binary_tarballs/bzlib.tar similarity index 100% rename from test/shed_functional/test_data/1420_files/binary_tarballs/bzlib.tar rename to lib/tool_shed/test/test_data/1420_files/binary_tarballs/bzlib.tar diff --git a/test/shed_functional/test_data/1420_files/binary_tarballs/lapack.tar b/lib/tool_shed/test/test_data/1420_files/binary_tarballs/lapack.tar similarity index 100% rename from test/shed_functional/test_data/1420_files/binary_tarballs/lapack.tar rename to lib/tool_shed/test/test_data/1420_files/binary_tarballs/lapack.tar diff --git a/test/shed_functional/test_data/1420_files/binary_tarballs/numpy.tar b/lib/tool_shed/test/test_data/1420_files/binary_tarballs/numpy.tar similarity index 100% rename from test/shed_functional/test_data/1420_files/binary_tarballs/numpy.tar rename to lib/tool_shed/test/test_data/1420_files/binary_tarballs/numpy.tar diff --git a/test/shed_functional/test_data/1420_files/binary_tarballs/rdkit.tar b/lib/tool_shed/test/test_data/1420_files/binary_tarballs/rdkit.tar similarity index 100% rename from test/shed_functional/test_data/1420_files/binary_tarballs/rdkit.tar rename to lib/tool_shed/test/test_data/1420_files/binary_tarballs/rdkit.tar diff --git a/test/shed_functional/test_data/1420_files/package_atlas_3_10_1420/tool_dependencies.xml b/lib/tool_shed/test/test_data/1420_files/package_atlas_3_10_1420/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/1420_files/package_atlas_3_10_1420/tool_dependencies.xml rename to lib/tool_shed/test/test_data/1420_files/package_atlas_3_10_1420/tool_dependencies.xml diff --git a/test/shed_functional/test_data/1420_files/package_boost_1_53_1420/tool_dependencies.xml b/lib/tool_shed/test/test_data/1420_files/package_boost_1_53_1420/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/1420_files/package_boost_1_53_1420/tool_dependencies.xml rename to lib/tool_shed/test/test_data/1420_files/package_boost_1_53_1420/tool_dependencies.xml diff --git a/test/shed_functional/test_data/1420_files/package_bzlib_1_0_1420/tool_dependencies.xml b/lib/tool_shed/test/test_data/1420_files/package_bzlib_1_0_1420/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/1420_files/package_bzlib_1_0_1420/tool_dependencies.xml rename to lib/tool_shed/test/test_data/1420_files/package_bzlib_1_0_1420/tool_dependencies.xml diff --git a/test/shed_functional/test_data/1420_files/package_lapack_3_4_1420/tool_dependencies.xml b/lib/tool_shed/test/test_data/1420_files/package_lapack_3_4_1420/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/1420_files/package_lapack_3_4_1420/tool_dependencies.xml rename to lib/tool_shed/test/test_data/1420_files/package_lapack_3_4_1420/tool_dependencies.xml diff --git a/test/shed_functional/test_data/1420_files/package_numpy_1_7_1420/tool_dependencies.xml b/lib/tool_shed/test/test_data/1420_files/package_numpy_1_7_1420/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/1420_files/package_numpy_1_7_1420/tool_dependencies.xml rename to lib/tool_shed/test/test_data/1420_files/package_numpy_1_7_1420/tool_dependencies.xml diff --git a/test/shed_functional/test_data/1420_files/package_rdkit_2012_12_1420/tool_dependencies.xml b/lib/tool_shed/test/test_data/1420_files/package_rdkit_2012_12_1420/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/1420_files/package_rdkit_2012_12_1420/tool_dependencies.xml rename to lib/tool_shed/test/test_data/1420_files/package_rdkit_2012_12_1420/tool_dependencies.xml diff --git a/test/shed_functional/test_data/1440_files/complex_dependency/tool_dependencies.xml b/lib/tool_shed/test/test_data/1440_files/complex_dependency/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/1440_files/complex_dependency/tool_dependencies.xml rename to lib/tool_shed/test/test_data/1440_files/complex_dependency/tool_dependencies.xml diff --git a/test/shed_functional/test_data/1440_files/dependency_definition/tool_dependencies.xml b/lib/tool_shed/test/test_data/1440_files/dependency_definition/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/1440_files/dependency_definition/tool_dependencies.xml rename to lib/tool_shed/test/test_data/1440_files/dependency_definition/tool_dependencies.xml diff --git a/test/shed_functional/test_data/1460_files/data_manager_files/test_data_manager.tar b/lib/tool_shed/test/test_data/1460_files/data_manager_files/test_data_manager.tar similarity index 100% rename from test/shed_functional/test_data/1460_files/data_manager_files/test_data_manager.tar rename to lib/tool_shed/test/test_data/1460_files/data_manager_files/test_data_manager.tar diff --git a/test/shed_functional/test_data/bed_to_gff_converter/bed_to_gff_converter.tar b/lib/tool_shed/test/test_data/bed_to_gff_converter/bed_to_gff_converter.tar similarity index 100% rename from test/shed_functional/test_data/bed_to_gff_converter/bed_to_gff_converter.tar rename to lib/tool_shed/test/test_data/bed_to_gff_converter/bed_to_gff_converter.tar diff --git a/test/shed_functional/test_data/bismark/bismark.tar b/lib/tool_shed/test/test_data/bismark/bismark.tar similarity index 100% rename from test/shed_functional/test_data/bismark/bismark.tar rename to lib/tool_shed/test/test_data/bismark/bismark.tar diff --git a/test/shed_functional/test_data/bismark/bismark_methylation_extractor.xml b/lib/tool_shed/test/test_data/bismark/bismark_methylation_extractor.xml similarity index 100% rename from test/shed_functional/test_data/bismark/bismark_methylation_extractor.xml rename to lib/tool_shed/test/test_data/bismark/bismark_methylation_extractor.xml diff --git a/test/shed_functional/test_data/blast/blast_datatypes.tar b/lib/tool_shed/test/test_data/blast/blast_datatypes.tar similarity index 100% rename from test/shed_functional/test_data/blast/blast_datatypes.tar rename to lib/tool_shed/test/test_data/blast/blast_datatypes.tar diff --git a/test/shed_functional/test_data/blast/blastxml_to_top_descr.tar b/lib/tool_shed/test/test_data/blast/blastxml_to_top_descr.tar similarity index 100% rename from test/shed_functional/test_data/blast/blastxml_to_top_descr.tar rename to lib/tool_shed/test/test_data/blast/blastxml_to_top_descr.tar diff --git a/test/shed_functional/test_data/bowtie2_loc_sample/bowtie2_indices.loc.sample b/lib/tool_shed/test/test_data/bowtie2_loc_sample/bowtie2_indices.loc.sample similarity index 100% rename from test/shed_functional/test_data/bowtie2_loc_sample/bowtie2_indices.loc.sample rename to lib/tool_shed/test/test_data/bowtie2_loc_sample/bowtie2_indices.loc.sample diff --git a/test/shed_functional/test_data/bwa/bwa_base.tar b/lib/tool_shed/test/test_data/bwa/bwa_base.tar similarity index 100% rename from test/shed_functional/test_data/bwa/bwa_base.tar rename to lib/tool_shed/test/test_data/bwa/bwa_base.tar diff --git a/test/shed_functional/test_data/bwa/bwa_color.tar b/lib/tool_shed/test/test_data/bwa/bwa_color.tar similarity index 100% rename from test/shed_functional/test_data/bwa/bwa_color.tar rename to lib/tool_shed/test/test_data/bwa/bwa_color.tar diff --git a/test/shed_functional/test_data/bwa/complex/bwa_base.tar b/lib/tool_shed/test/test_data/bwa/complex/bwa_base.tar similarity index 100% rename from test/shed_functional/test_data/bwa/complex/bwa_base.tar rename to lib/tool_shed/test/test_data/bwa/complex/bwa_base.tar diff --git a/test/shed_functional/test_data/bwa/complex/readme/tool_dependencies.xml b/lib/tool_shed/test/test_data/bwa/complex/readme/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/bwa/complex/readme/tool_dependencies.xml rename to lib/tool_shed/test/test_data/bwa/complex/readme/tool_dependencies.xml diff --git a/test/shed_functional/test_data/bwa/complex/tool_dependencies.xml b/lib/tool_shed/test/test_data/bwa/complex/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/bwa/complex/tool_dependencies.xml rename to lib/tool_shed/test/test_data/bwa/complex/tool_dependencies.xml diff --git a/test/shed_functional/test_data/column_maker/column_maker.tar b/lib/tool_shed/test/test_data/column_maker/column_maker.tar similarity index 100% rename from test/shed_functional/test_data/column_maker/column_maker.tar rename to lib/tool_shed/test/test_data/column_maker/column_maker.tar diff --git a/test/shed_functional/test_data/convert_chars/convert_chars.tar b/lib/tool_shed/test/test_data/convert_chars/convert_chars.tar similarity index 100% rename from test/shed_functional/test_data/convert_chars/convert_chars.tar rename to lib/tool_shed/test/test_data/convert_chars/convert_chars.tar diff --git a/test/shed_functional/test_data/emboss/0470_files/emboss_complex_dependency.tar b/lib/tool_shed/test/test_data/emboss/0470_files/emboss_complex_dependency.tar similarity index 100% rename from test/shed_functional/test_data/emboss/0470_files/emboss_complex_dependency.tar rename to lib/tool_shed/test/test_data/emboss/0470_files/emboss_complex_dependency.tar diff --git a/test/shed_functional/test_data/emboss/0470_files/tool_dependencies.xml b/lib/tool_shed/test/test_data/emboss/0470_files/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/emboss/0470_files/tool_dependencies.xml rename to lib/tool_shed/test/test_data/emboss/0470_files/tool_dependencies.xml diff --git a/test/shed_functional/test_data/emboss/datatypes/datatypes_conf.xml b/lib/tool_shed/test/test_data/emboss/datatypes/datatypes_conf.xml similarity index 100% rename from test/shed_functional/test_data/emboss/datatypes/datatypes_conf.xml rename to lib/tool_shed/test/test_data/emboss/datatypes/datatypes_conf.xml diff --git a/test/shed_functional/test_data/emboss/emboss.tar b/lib/tool_shed/test/test_data/emboss/emboss.tar similarity index 100% rename from test/shed_functional/test_data/emboss/emboss.tar rename to lib/tool_shed/test/test_data/emboss/emboss.tar diff --git a/test/shed_functional/test_data/emboss/emboss_5_0_0/first_tool_dependency/tool_dependencies.xml b/lib/tool_shed/test/test_data/emboss/emboss_5_0_0/first_tool_dependency/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/emboss/emboss_5_0_0/first_tool_dependency/tool_dependencies.xml rename to lib/tool_shed/test/test_data/emboss/emboss_5_0_0/first_tool_dependency/tool_dependencies.xml diff --git a/test/shed_functional/test_data/emboss/emboss_5_0_0/second_tool_dependency/tool_dependencies.xml b/lib/tool_shed/test/test_data/emboss/emboss_5_0_0/second_tool_dependency/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/emboss/emboss_5_0_0/second_tool_dependency/tool_dependencies.xml rename to lib/tool_shed/test/test_data/emboss/emboss_5_0_0/second_tool_dependency/tool_dependencies.xml diff --git a/test/shed_functional/test_data/emboss/libx11_proto/first_tool_dependency/tool_dependencies.xml b/lib/tool_shed/test/test_data/emboss/libx11_proto/first_tool_dependency/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/emboss/libx11_proto/first_tool_dependency/tool_dependencies.xml rename to lib/tool_shed/test/test_data/emboss/libx11_proto/first_tool_dependency/tool_dependencies.xml diff --git a/test/shed_functional/test_data/emboss/libx11_proto/second_tool_dependency/tool_dependencies.xml b/lib/tool_shed/test/test_data/emboss/libx11_proto/second_tool_dependency/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/emboss/libx11_proto/second_tool_dependency/tool_dependencies.xml rename to lib/tool_shed/test/test_data/emboss/libx11_proto/second_tool_dependency/tool_dependencies.xml diff --git a/test/shed_functional/test_data/filtering/README b/lib/tool_shed/test/test_data/filtering/README similarity index 100% rename from test/shed_functional/test_data/filtering/README rename to lib/tool_shed/test/test_data/filtering/README diff --git a/test/shed_functional/test_data/filtering/filtering_0000.txt b/lib/tool_shed/test/test_data/filtering/filtering_0000.txt similarity index 100% rename from test/shed_functional/test_data/filtering/filtering_0000.txt rename to lib/tool_shed/test/test_data/filtering/filtering_0000.txt diff --git a/test/shed_functional/test_data/filtering/filtering_1.1.0.tar b/lib/tool_shed/test/test_data/filtering/filtering_1.1.0.tar similarity index 100% rename from test/shed_functional/test_data/filtering/filtering_1.1.0.tar rename to lib/tool_shed/test/test_data/filtering/filtering_1.1.0.tar diff --git a/test/shed_functional/test_data/filtering/filtering_2.2.0.tar b/lib/tool_shed/test/test_data/filtering/filtering_2.2.0.tar similarity index 100% rename from test/shed_functional/test_data/filtering/filtering_2.2.0.tar rename to lib/tool_shed/test/test_data/filtering/filtering_2.2.0.tar diff --git a/test/shed_functional/test_data/filtering/filtering_test_data.tar b/lib/tool_shed/test/test_data/filtering/filtering_test_data.tar similarity index 100% rename from test/shed_functional/test_data/filtering/filtering_test_data.tar rename to lib/tool_shed/test/test_data/filtering/filtering_test_data.tar diff --git a/test/shed_functional/test_data/filtering/readme.txt b/lib/tool_shed/test/test_data/filtering/readme.txt similarity index 100% rename from test/shed_functional/test_data/filtering/readme.txt rename to lib/tool_shed/test/test_data/filtering/readme.txt diff --git a/test/shed_functional/test_data/filtering_workflow/Workflow_for_0060_filter_workflow_repository.ga b/lib/tool_shed/test/test_data/filtering_workflow/Workflow_for_0060_filter_workflow_repository.ga similarity index 100% rename from test/shed_functional/test_data/filtering_workflow/Workflow_for_0060_filter_workflow_repository.ga rename to lib/tool_shed/test/test_data/filtering_workflow/Workflow_for_0060_filter_workflow_repository.ga diff --git a/test/shed_functional/test_data/freebayes/freebayes.tar b/lib/tool_shed/test/test_data/freebayes/freebayes.tar similarity index 100% rename from test/shed_functional/test_data/freebayes/freebayes.tar rename to lib/tool_shed/test/test_data/freebayes/freebayes.tar diff --git a/test/shed_functional/test_data/freebayes/freebayes.xml b/lib/tool_shed/test/test_data/freebayes/freebayes.xml similarity index 100% rename from test/shed_functional/test_data/freebayes/freebayes.xml rename to lib/tool_shed/test/test_data/freebayes/freebayes.xml diff --git a/test/shed_functional/test_data/freebayes/invalid_tool_dependencies/tool_dependencies.xml b/lib/tool_shed/test/test_data/freebayes/invalid_tool_dependencies/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/freebayes/invalid_tool_dependencies/tool_dependencies.xml rename to lib/tool_shed/test/test_data/freebayes/invalid_tool_dependencies/tool_dependencies.xml diff --git a/test/shed_functional/test_data/freebayes/malformed_tool_dependencies/tool_dependencies.xml b/lib/tool_shed/test/test_data/freebayes/malformed_tool_dependencies/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/freebayes/malformed_tool_dependencies/tool_dependencies.xml rename to lib/tool_shed/test/test_data/freebayes/malformed_tool_dependencies/tool_dependencies.xml diff --git a/test/shed_functional/test_data/freebayes/sam_fa_indices.loc.sample b/lib/tool_shed/test/test_data/freebayes/sam_fa_indices.loc.sample similarity index 100% rename from test/shed_functional/test_data/freebayes/sam_fa_indices.loc.sample rename to lib/tool_shed/test/test_data/freebayes/sam_fa_indices.loc.sample diff --git a/test/shed_functional/test_data/freebayes/tool_data_table_conf.xml.sample b/lib/tool_shed/test/test_data/freebayes/tool_data_table_conf.xml.sample similarity index 100% rename from test/shed_functional/test_data/freebayes/tool_data_table_conf.xml.sample rename to lib/tool_shed/test/test_data/freebayes/tool_data_table_conf.xml.sample diff --git a/test/shed_functional/test_data/freebayes/tool_dependencies.xml b/lib/tool_shed/test/test_data/freebayes/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/freebayes/tool_dependencies.xml rename to lib/tool_shed/test/test_data/freebayes/tool_dependencies.xml diff --git a/test/shed_functional/test_data/htseq_count/htseq_count.tar b/lib/tool_shed/test/test_data/htseq_count/htseq_count.tar similarity index 100% rename from test/shed_functional/test_data/htseq_count/htseq_count.tar rename to lib/tool_shed/test/test_data/htseq_count/htseq_count.tar diff --git a/test/shed_functional/test_data/package_matplotlib/package_matplotlib_1_2.tar b/lib/tool_shed/test/test_data/package_matplotlib/package_matplotlib_1_2.tar similarity index 100% rename from test/shed_functional/test_data/package_matplotlib/package_matplotlib_1_2.tar rename to lib/tool_shed/test/test_data/package_matplotlib/package_matplotlib_1_2.tar diff --git a/test/shed_functional/test_data/package_matplotlib/tool_dependencies.xml b/lib/tool_shed/test/test_data/package_matplotlib/tool_dependencies.xml similarity index 100% rename from test/shed_functional/test_data/package_matplotlib/tool_dependencies.xml rename to lib/tool_shed/test/test_data/package_matplotlib/tool_dependencies.xml diff --git a/test/shed_functional/test_data/package_numpy/package_numpy_1_7.tar b/lib/tool_shed/test/test_data/package_numpy/package_numpy_1_7.tar similarity index 100% rename from test/shed_functional/test_data/package_numpy/package_numpy_1_7.tar rename to lib/tool_shed/test/test_data/package_numpy/package_numpy_1_7.tar diff --git a/test/shed_functional/test_data/proteomics_datatypes/proteomics_datatypes.tar b/lib/tool_shed/test/test_data/proteomics_datatypes/proteomics_datatypes.tar similarity index 100% rename from test/shed_functional/test_data/proteomics_datatypes/proteomics_datatypes.tar rename to lib/tool_shed/test/test_data/proteomics_datatypes/proteomics_datatypes.tar diff --git a/test/shed_functional/test_data/readme.txt b/lib/tool_shed/test/test_data/readme.txt similarity index 100% rename from test/shed_functional/test_data/readme.txt rename to lib/tool_shed/test/test_data/readme.txt diff --git a/test/shed_functional/test_data/repository_capsules/0490_filtering.tar.gz b/lib/tool_shed/test/test_data/repository_capsules/0490_filtering.tar.gz similarity index 100% rename from test/shed_functional/test_data/repository_capsules/0490_filtering.tar.gz rename to lib/tool_shed/test/test_data/repository_capsules/0490_filtering.tar.gz diff --git a/test/shed_functional/test_data/repository_capsules/0500_emboss_5.tar.gz b/lib/tool_shed/test/test_data/repository_capsules/0500_emboss_5.tar.gz similarity index 100% rename from test/shed_functional/test_data/repository_capsules/0500_emboss_5.tar.gz rename to lib/tool_shed/test/test_data/repository_capsules/0500_emboss_5.tar.gz diff --git a/test/shed_functional/test_data/repository_capsules/0510_trans_proteomic_pipeline.tar.gz b/lib/tool_shed/test/test_data/repository_capsules/0510_trans_proteomic_pipeline.tar.gz similarity index 100% rename from test/shed_functional/test_data/repository_capsules/0510_trans_proteomic_pipeline.tar.gz rename to lib/tool_shed/test/test_data/repository_capsules/0510_trans_proteomic_pipeline.tar.gz diff --git a/test/shed_functional/test_data/repository_capsules/0520_filtering.tar.gz b/lib/tool_shed/test/test_data/repository_capsules/0520_filtering.tar.gz similarity index 100% rename from test/shed_functional/test_data/repository_capsules/0520_filtering.tar.gz rename to lib/tool_shed/test/test_data/repository_capsules/0520_filtering.tar.gz diff --git a/packages/test_api/HISTORY.rst b/packages/test_api/HISTORY.rst new file mode 100644 index 00000000000..7cb67f838f8 --- /dev/null +++ b/packages/test_api/HISTORY.rst @@ -0,0 +1,12 @@ +.. :changelog: + +History +------- + +.. to_doc + +--------------------- +20.1.0.dev0 +--------------------- + +* Initial import from dev branch of Galaxy during 20.01 development cycle. diff --git a/packages/test_api/LICENSE b/packages/test_api/LICENSE new file mode 120000 index 00000000000..1ef648f64b3 --- /dev/null +++ b/packages/test_api/LICENSE @@ -0,0 +1 @@ +../../LICENSE.txt \ No newline at end of file diff --git a/packages/test_api/MANIFEST.in b/packages/test_api/MANIFEST.in new file mode 100644 index 00000000000..c74cefe0942 --- /dev/null +++ b/packages/test_api/MANIFEST.in @@ -0,0 +1 @@ +include *.rst LICENSE diff --git a/packages/test_api/Makefile b/packages/test_api/Makefile new file mode 120000 index 00000000000..37af8bae5ba --- /dev/null +++ b/packages/test_api/Makefile @@ -0,0 +1 @@ +../package.Makefile \ No newline at end of file diff --git a/packages/test_api/README.rst b/packages/test_api/README.rst new file mode 100644 index 00000000000..6b19adae56c --- /dev/null +++ b/packages/test_api/README.rst @@ -0,0 +1,15 @@ + +.. image:: https://badge.fury.io/py/galaxy-test-api.svg + :target: https://pypi.org/project/galaxy-test-api/ + + + +Overview +-------- + +The Galaxy_ API tests. + +* Free software: Academic Free License version 3.0 +* Code: https://github.com/galaxyproject/galaxy + +.. _Galaxy: http://galaxyproject.org/ diff --git a/packages/test_api/dev-requirements.txt b/packages/test_api/dev-requirements.txt new file mode 120000 index 00000000000..467b90d7a23 --- /dev/null +++ b/packages/test_api/dev-requirements.txt @@ -0,0 +1 @@ +../package-dev-requirements.txt \ No newline at end of file diff --git a/packages/test_api/galaxy/__init__.py b/packages/test_api/galaxy/__init__.py new file mode 100644 index 00000000000..69e3be50dac --- /dev/null +++ b/packages/test_api/galaxy/__init__.py @@ -0,0 +1 @@ +__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/packages/test_api/galaxy/project_galaxy_test_api.py b/packages/test_api/galaxy/project_galaxy_test_api.py new file mode 100644 index 00000000000..eb9c6e2d8eb --- /dev/null +++ b/packages/test_api/galaxy/project_galaxy_test_api.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- + +__version__ = '20.1.0.dev0' + +PROJECT_NAME = "galaxy-test-api" +PROJECT_OWNER = PROJECT_USERAME = "galaxyproject" +PROJECT_URL = "https://github.com/galaxyproject/galaxy" +PROJECT_AUTHOR = 'Galaxy Project and Community' +PROJECT_DESCRIPTION = 'Galaxy API Tests' +PROJECT_EMAIL = 'galaxy-committers@lists.galaxyproject.org' +RAW_CONTENT_URL = "https://raw.github.com/%s/%s/master/" % ( + PROJECT_USERAME, PROJECT_NAME +) diff --git a/packages/test_api/galaxy_test/__init__.py b/packages/test_api/galaxy_test/__init__.py new file mode 100644 index 00000000000..69e3be50dac --- /dev/null +++ b/packages/test_api/galaxy_test/__init__.py @@ -0,0 +1 @@ +__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/packages/test_api/galaxy_test/api b/packages/test_api/galaxy_test/api new file mode 120000 index 00000000000..c6320046e05 --- /dev/null +++ b/packages/test_api/galaxy_test/api @@ -0,0 +1 @@ +../../../lib/galaxy_test/api \ No newline at end of file diff --git a/packages/test_api/requirements.txt b/packages/test_api/requirements.txt new file mode 100644 index 00000000000..e548169079b --- /dev/null +++ b/packages/test_api/requirements.txt @@ -0,0 +1,2 @@ +galaxy-test-driver + diff --git a/packages/test_api/scripts b/packages/test_api/scripts new file mode 120000 index 00000000000..9aec9dc5a06 --- /dev/null +++ b/packages/test_api/scripts @@ -0,0 +1 @@ +../build_scripts \ No newline at end of file diff --git a/packages/test_api/setup.cfg b/packages/test_api/setup.cfg new file mode 120000 index 00000000000..eb7cf09393f --- /dev/null +++ b/packages/test_api/setup.cfg @@ -0,0 +1 @@ +../../setup.cfg \ No newline at end of file diff --git a/packages/test_api/setup.py b/packages/test_api/setup.py new file mode 100644 index 00000000000..f5b10798a4f --- /dev/null +++ b/packages/test_api/setup.py @@ -0,0 +1,100 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import ast +import os +import re +try: + from setuptools import setup +except ImportError: + from distutils.core import setup + +SOURCE_DIR = "galaxy" + +_version_re = re.compile(r'__version__\s+=\s+(.*)') + +project_short_name = os.path.basename(os.path.dirname(os.path.realpath(__file__))) +with open('%s/project_galaxy_%s.py' % (SOURCE_DIR, project_short_name), 'rb') as f: + init_contents = f.read().decode('utf-8') + + def get_var(var_name): + pattern = re.compile(r'%s\s+=\s+(.*)' % var_name) + match = pattern.search(init_contents).group(1) + return str(ast.literal_eval(match)) + + version = get_var("__version__") + PROJECT_NAME = get_var("PROJECT_NAME") + PROJECT_URL = get_var("PROJECT_URL") + PROJECT_AUTHOR = get_var("PROJECT_AUTHOR") + PROJECT_EMAIL = get_var("PROJECT_EMAIL") + PROJECT_DESCRIPTION = get_var("PROJECT_DESCRIPTION") + +TEST_DIR = 'tests' +PACKAGES = [ + 'galaxy_test', + 'galaxy_test.api', +] +ENTRY_POINTS = ''' + [console_scripts] +''' +PACKAGE_DATA = { + # Be sure to update MANIFEST.in for source dist. + 'galaxy': [ + ], +} +PACKAGE_DIR = { + SOURCE_DIR: SOURCE_DIR, + 'galaxy_test': 'galaxy_test', +} + +readme = open('README.rst').read() +history = open('HISTORY.rst').read().replace('.. :changelog:', '') + +if os.path.exists("requirements.txt"): + requirements = open("requirements.txt").read().split("\n") +else: + # In tox, it will cover them anyway. + requirements = [] + + +test_requirements = [ + # TODO: put package test requirements here +] + + +setup( + name=PROJECT_NAME, + version=version, + description=PROJECT_DESCRIPTION, + long_description=readme + '\n\n' + history, + long_description_content_type='text/x-rst', + author=PROJECT_AUTHOR, + author_email=PROJECT_EMAIL, + url=PROJECT_URL, + packages=PACKAGES, + entry_points=ENTRY_POINTS, + package_data=PACKAGE_DATA, + package_dir=PACKAGE_DIR, + include_package_data=True, + install_requires=requirements, + license="AFL", + zip_safe=False, + keywords='galaxy', + classifiers=[ + 'Development Status :: 5 - Production/Stable', + 'Intended Audience :: Developers', + 'Environment :: Console', + 'License :: OSI Approved :: Academic Free License (AFL)', + 'Operating System :: POSIX', + 'Topic :: Software Development', + 'Topic :: Software Development :: Testing', + 'Natural Language :: English', + "Programming Language :: Python :: 2", + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + ], + test_suite=TEST_DIR, + tests_require=test_requirements +) diff --git a/packages/test_base/HISTORY.rst b/packages/test_base/HISTORY.rst new file mode 100644 index 00000000000..7cb67f838f8 --- /dev/null +++ b/packages/test_base/HISTORY.rst @@ -0,0 +1,12 @@ +.. :changelog: + +History +------- + +.. to_doc + +--------------------- +20.1.0.dev0 +--------------------- + +* Initial import from dev branch of Galaxy during 20.01 development cycle. diff --git a/packages/test_base/LICENSE b/packages/test_base/LICENSE new file mode 120000 index 00000000000..1ef648f64b3 --- /dev/null +++ b/packages/test_base/LICENSE @@ -0,0 +1 @@ +../../LICENSE.txt \ No newline at end of file diff --git a/packages/test_base/MANIFEST.in b/packages/test_base/MANIFEST.in new file mode 100644 index 00000000000..c74cefe0942 --- /dev/null +++ b/packages/test_base/MANIFEST.in @@ -0,0 +1 @@ +include *.rst LICENSE diff --git a/packages/test_base/Makefile b/packages/test_base/Makefile new file mode 120000 index 00000000000..37af8bae5ba --- /dev/null +++ b/packages/test_base/Makefile @@ -0,0 +1 @@ +../package.Makefile \ No newline at end of file diff --git a/packages/test_base/README.rst b/packages/test_base/README.rst new file mode 100644 index 00000000000..feb0c31fd03 --- /dev/null +++ b/packages/test_base/README.rst @@ -0,0 +1,15 @@ + +.. image:: https://badge.fury.io/py/galaxy-test-base.svg + :target: https://pypi.org/project/galaxy-test-base/ + + + +Overview +-------- + +The Galaxy_ testing base package. + +* Free software: Academic Free License version 3.0 +* Code: https://github.com/galaxyproject/galaxy + +.. _Galaxy: http://galaxyproject.org/ diff --git a/packages/test_base/dev-requirements.txt b/packages/test_base/dev-requirements.txt new file mode 120000 index 00000000000..467b90d7a23 --- /dev/null +++ b/packages/test_base/dev-requirements.txt @@ -0,0 +1 @@ +../package-dev-requirements.txt \ No newline at end of file diff --git a/packages/test_base/galaxy/__init__.py b/packages/test_base/galaxy/__init__.py new file mode 100644 index 00000000000..69e3be50dac --- /dev/null +++ b/packages/test_base/galaxy/__init__.py @@ -0,0 +1 @@ +__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/packages/test_base/galaxy/project_galaxy_test_base.py b/packages/test_base/galaxy/project_galaxy_test_base.py new file mode 100644 index 00000000000..668485b359f --- /dev/null +++ b/packages/test_base/galaxy/project_galaxy_test_base.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- + +__version__ = '20.1.0.dev0' + +PROJECT_NAME = "galaxy-test-base" +PROJECT_OWNER = PROJECT_USERAME = "galaxyproject" +PROJECT_URL = "https://github.com/galaxyproject/galaxy" +PROJECT_AUTHOR = 'Galaxy Project and Community' +PROJECT_DESCRIPTION = 'Galaxy Testing Utilities' +PROJECT_EMAIL = 'galaxy-committers@lists.galaxyproject.org' +RAW_CONTENT_URL = "https://raw.github.com/%s/%s/master/" % ( + PROJECT_USERAME, PROJECT_NAME +) diff --git a/packages/test_base/galaxy_test/__init__.py b/packages/test_base/galaxy_test/__init__.py new file mode 100644 index 00000000000..69e3be50dac --- /dev/null +++ b/packages/test_base/galaxy_test/__init__.py @@ -0,0 +1 @@ +__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/packages/test_base/galaxy_test/base b/packages/test_base/galaxy_test/base new file mode 120000 index 00000000000..0e6d4b9ff06 --- /dev/null +++ b/packages/test_base/galaxy_test/base @@ -0,0 +1 @@ +../../../lib/galaxy_test/base \ No newline at end of file diff --git a/packages/test_base/requirements.txt b/packages/test_base/requirements.txt new file mode 100644 index 00000000000..e8566b22706 --- /dev/null +++ b/packages/test_base/requirements.txt @@ -0,0 +1,4 @@ +galaxy-data +nose +pytest + diff --git a/packages/test_base/scripts b/packages/test_base/scripts new file mode 120000 index 00000000000..9aec9dc5a06 --- /dev/null +++ b/packages/test_base/scripts @@ -0,0 +1 @@ +../build_scripts \ No newline at end of file diff --git a/packages/test_base/setup.cfg b/packages/test_base/setup.cfg new file mode 120000 index 00000000000..eb7cf09393f --- /dev/null +++ b/packages/test_base/setup.cfg @@ -0,0 +1 @@ +../../setup.cfg \ No newline at end of file diff --git a/packages/test_base/setup.py b/packages/test_base/setup.py new file mode 100644 index 00000000000..d517c2ab9d7 --- /dev/null +++ b/packages/test_base/setup.py @@ -0,0 +1,100 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import ast +import os +import re +try: + from setuptools import setup +except ImportError: + from distutils.core import setup + +SOURCE_DIR = "galaxy" + +_version_re = re.compile(r'__version__\s+=\s+(.*)') + +project_short_name = os.path.basename(os.path.dirname(os.path.realpath(__file__))) +with open('%s/project_galaxy_%s.py' % (SOURCE_DIR, project_short_name), 'rb') as f: + init_contents = f.read().decode('utf-8') + + def get_var(var_name): + pattern = re.compile(r'%s\s+=\s+(.*)' % var_name) + match = pattern.search(init_contents).group(1) + return str(ast.literal_eval(match)) + + version = get_var("__version__") + PROJECT_NAME = get_var("PROJECT_NAME") + PROJECT_URL = get_var("PROJECT_URL") + PROJECT_AUTHOR = get_var("PROJECT_AUTHOR") + PROJECT_EMAIL = get_var("PROJECT_EMAIL") + PROJECT_DESCRIPTION = get_var("PROJECT_DESCRIPTION") + +TEST_DIR = 'tests' +PACKAGES = [ + 'galaxy_test', + 'galaxy_test.base', +] +ENTRY_POINTS = ''' + [console_scripts] +''' +PACKAGE_DATA = { + # Be sure to update MANIFEST.in for source dist. + 'galaxy': [ + ], +} +PACKAGE_DIR = { + SOURCE_DIR: SOURCE_DIR, + 'galaxy_test': 'galaxy_test', +} + +readme = open('README.rst').read() +history = open('HISTORY.rst').read().replace('.. :changelog:', '') + +if os.path.exists("requirements.txt"): + requirements = open("requirements.txt").read().split("\n") +else: + # In tox, it will cover them anyway. + requirements = [] + + +test_requirements = [ + # TODO: put package test requirements here +] + + +setup( + name=PROJECT_NAME, + version=version, + description=PROJECT_DESCRIPTION, + long_description=readme + '\n\n' + history, + long_description_content_type='text/x-rst', + author=PROJECT_AUTHOR, + author_email=PROJECT_EMAIL, + url=PROJECT_URL, + packages=PACKAGES, + entry_points=ENTRY_POINTS, + package_data=PACKAGE_DATA, + package_dir=PACKAGE_DIR, + include_package_data=True, + install_requires=requirements, + license="AFL", + zip_safe=False, + keywords='galaxy', + classifiers=[ + 'Development Status :: 5 - Production/Stable', + 'Intended Audience :: Developers', + 'Environment :: Console', + 'License :: OSI Approved :: Academic Free License (AFL)', + 'Operating System :: POSIX', + 'Topic :: Software Development', + 'Topic :: Software Development :: Testing', + 'Natural Language :: English', + "Programming Language :: Python :: 2", + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + ], + test_suite=TEST_DIR, + tests_require=test_requirements +) diff --git a/packages/test_driver/HISTORY.rst b/packages/test_driver/HISTORY.rst new file mode 100644 index 00000000000..7cb67f838f8 --- /dev/null +++ b/packages/test_driver/HISTORY.rst @@ -0,0 +1,12 @@ +.. :changelog: + +History +------- + +.. to_doc + +--------------------- +20.1.0.dev0 +--------------------- + +* Initial import from dev branch of Galaxy during 20.01 development cycle. diff --git a/packages/test_driver/LICENSE b/packages/test_driver/LICENSE new file mode 120000 index 00000000000..1ef648f64b3 --- /dev/null +++ b/packages/test_driver/LICENSE @@ -0,0 +1 @@ +../../LICENSE.txt \ No newline at end of file diff --git a/packages/test_driver/MANIFEST.in b/packages/test_driver/MANIFEST.in new file mode 100644 index 00000000000..c74cefe0942 --- /dev/null +++ b/packages/test_driver/MANIFEST.in @@ -0,0 +1 @@ +include *.rst LICENSE diff --git a/packages/test_driver/Makefile b/packages/test_driver/Makefile new file mode 120000 index 00000000000..37af8bae5ba --- /dev/null +++ b/packages/test_driver/Makefile @@ -0,0 +1 @@ +../package.Makefile \ No newline at end of file diff --git a/packages/test_driver/README.rst b/packages/test_driver/README.rst new file mode 100644 index 00000000000..6a9177b983c --- /dev/null +++ b/packages/test_driver/README.rst @@ -0,0 +1,15 @@ + +.. image:: https://badge.fury.io/py/galaxy-test-driver.svg + :target: https://pypi.org/project/galaxy-test-driver/ + + + +Overview +-------- + +The Galaxy_ test driver package. + +* Free software: Academic Free License version 3.0 +* Code: https://github.com/galaxyproject/galaxy + +.. _Galaxy: http://galaxyproject.org/ diff --git a/packages/test_driver/dev-requirements.txt b/packages/test_driver/dev-requirements.txt new file mode 120000 index 00000000000..467b90d7a23 --- /dev/null +++ b/packages/test_driver/dev-requirements.txt @@ -0,0 +1 @@ +../package-dev-requirements.txt \ No newline at end of file diff --git a/packages/test_driver/galaxy/__init__.py b/packages/test_driver/galaxy/__init__.py new file mode 100644 index 00000000000..69e3be50dac --- /dev/null +++ b/packages/test_driver/galaxy/__init__.py @@ -0,0 +1 @@ +__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/packages/test_driver/galaxy/project_galaxy_test_driver.py b/packages/test_driver/galaxy/project_galaxy_test_driver.py new file mode 100644 index 00000000000..3c665e4adfb --- /dev/null +++ b/packages/test_driver/galaxy/project_galaxy_test_driver.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- + +__version__ = '20.1.0.dev0' + +PROJECT_NAME = "galaxy-test-driver" +PROJECT_OWNER = PROJECT_USERAME = "galaxyproject" +PROJECT_URL = "https://github.com/galaxyproject/galaxy" +PROJECT_AUTHOR = 'Galaxy Project and Community' +PROJECT_DESCRIPTION = 'Galaxy Test Driver' +PROJECT_EMAIL = 'galaxy-committers@lists.galaxyproject.org' +RAW_CONTENT_URL = "https://raw.github.com/%s/%s/master/" % ( + PROJECT_USERAME, PROJECT_NAME +) diff --git a/packages/test_driver/galaxy_test/__init__.py b/packages/test_driver/galaxy_test/__init__.py new file mode 100644 index 00000000000..69e3be50dac --- /dev/null +++ b/packages/test_driver/galaxy_test/__init__.py @@ -0,0 +1 @@ +__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/packages/test_driver/galaxy_test/driver b/packages/test_driver/galaxy_test/driver new file mode 120000 index 00000000000..cf8189d7f3e --- /dev/null +++ b/packages/test_driver/galaxy_test/driver @@ -0,0 +1 @@ +../../../lib/galaxy_test/driver \ No newline at end of file diff --git a/packages/test_driver/requirements.txt b/packages/test_driver/requirements.txt new file mode 100644 index 00000000000..e8566b22706 --- /dev/null +++ b/packages/test_driver/requirements.txt @@ -0,0 +1,4 @@ +galaxy-data +nose +pytest + diff --git a/packages/test_driver/scripts b/packages/test_driver/scripts new file mode 120000 index 00000000000..9aec9dc5a06 --- /dev/null +++ b/packages/test_driver/scripts @@ -0,0 +1 @@ +../build_scripts \ No newline at end of file diff --git a/packages/test_driver/setup.cfg b/packages/test_driver/setup.cfg new file mode 120000 index 00000000000..eb7cf09393f --- /dev/null +++ b/packages/test_driver/setup.cfg @@ -0,0 +1 @@ +../../setup.cfg \ No newline at end of file diff --git a/packages/test_driver/setup.py b/packages/test_driver/setup.py new file mode 100644 index 00000000000..b0d9cce9ded --- /dev/null +++ b/packages/test_driver/setup.py @@ -0,0 +1,100 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import ast +import os +import re +try: + from setuptools import setup +except ImportError: + from distutils.core import setup + +SOURCE_DIR = "galaxy" + +_version_re = re.compile(r'__version__\s+=\s+(.*)') + +project_short_name = os.path.basename(os.path.dirname(os.path.realpath(__file__))) +with open('%s/project_galaxy_%s.py' % (SOURCE_DIR, project_short_name), 'rb') as f: + init_contents = f.read().decode('utf-8') + + def get_var(var_name): + pattern = re.compile(r'%s\s+=\s+(.*)' % var_name) + match = pattern.search(init_contents).group(1) + return str(ast.literal_eval(match)) + + version = get_var("__version__") + PROJECT_NAME = get_var("PROJECT_NAME") + PROJECT_URL = get_var("PROJECT_URL") + PROJECT_AUTHOR = get_var("PROJECT_AUTHOR") + PROJECT_EMAIL = get_var("PROJECT_EMAIL") + PROJECT_DESCRIPTION = get_var("PROJECT_DESCRIPTION") + +TEST_DIR = 'tests' +PACKAGES = [ + 'galaxy_test', + 'galaxy_test.driver', +] +ENTRY_POINTS = ''' + [console_scripts] +''' +PACKAGE_DATA = { + # Be sure to update MANIFEST.in for source dist. + 'galaxy': [ + ], +} +PACKAGE_DIR = { + SOURCE_DIR: SOURCE_DIR, + 'galaxy_test': 'galaxy_test', +} + +readme = open('README.rst').read() +history = open('HISTORY.rst').read().replace('.. :changelog:', '') + +if os.path.exists("requirements.txt"): + requirements = open("requirements.txt").read().split("\n") +else: + # In tox, it will cover them anyway. + requirements = [] + + +test_requirements = [ + # TODO: put package test requirements here +] + + +setup( + name=PROJECT_NAME, + version=version, + description=PROJECT_DESCRIPTION, + long_description=readme + '\n\n' + history, + long_description_content_type='text/x-rst', + author=PROJECT_AUTHOR, + author_email=PROJECT_EMAIL, + url=PROJECT_URL, + packages=PACKAGES, + entry_points=ENTRY_POINTS, + package_data=PACKAGE_DATA, + package_dir=PACKAGE_DIR, + include_package_data=True, + install_requires=requirements, + license="AFL", + zip_safe=False, + keywords='galaxy', + classifiers=[ + 'Development Status :: 5 - Production/Stable', + 'Intended Audience :: Developers', + 'Environment :: Console', + 'License :: OSI Approved :: Academic Free License (AFL)', + 'Operating System :: POSIX', + 'Topic :: Software Development', + 'Topic :: Software Development :: Testing', + 'Natural Language :: English', + "Programming Language :: Python :: 2", + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + ], + test_suite=TEST_DIR, + tests_require=test_requirements +) diff --git a/packages/test_selenium/HISTORY.rst b/packages/test_selenium/HISTORY.rst new file mode 100644 index 00000000000..7cb67f838f8 --- /dev/null +++ b/packages/test_selenium/HISTORY.rst @@ -0,0 +1,12 @@ +.. :changelog: + +History +------- + +.. to_doc + +--------------------- +20.1.0.dev0 +--------------------- + +* Initial import from dev branch of Galaxy during 20.01 development cycle. diff --git a/packages/test_selenium/LICENSE b/packages/test_selenium/LICENSE new file mode 120000 index 00000000000..1ef648f64b3 --- /dev/null +++ b/packages/test_selenium/LICENSE @@ -0,0 +1 @@ +../../LICENSE.txt \ No newline at end of file diff --git a/packages/test_selenium/MANIFEST.in b/packages/test_selenium/MANIFEST.in new file mode 100644 index 00000000000..c74cefe0942 --- /dev/null +++ b/packages/test_selenium/MANIFEST.in @@ -0,0 +1 @@ +include *.rst LICENSE diff --git a/packages/test_selenium/Makefile b/packages/test_selenium/Makefile new file mode 120000 index 00000000000..37af8bae5ba --- /dev/null +++ b/packages/test_selenium/Makefile @@ -0,0 +1 @@ +../package.Makefile \ No newline at end of file diff --git a/packages/test_selenium/README.rst b/packages/test_selenium/README.rst new file mode 100644 index 00000000000..36fa941e20e --- /dev/null +++ b/packages/test_selenium/README.rst @@ -0,0 +1,15 @@ + +.. image:: https://badge.fury.io/py/galaxy-test-selenium.svg + :target: https://pypi.org/project/galaxy-test-selenium/ + + + +Overview +-------- + +The Galaxy_ Selenium tests. + +* Free software: Academic Free License version 3.0 +* Code: https://github.com/galaxyproject/galaxy + +.. _Galaxy: http://galaxyproject.org/ diff --git a/packages/test_selenium/dev-requirements.txt b/packages/test_selenium/dev-requirements.txt new file mode 120000 index 00000000000..467b90d7a23 --- /dev/null +++ b/packages/test_selenium/dev-requirements.txt @@ -0,0 +1 @@ +../package-dev-requirements.txt \ No newline at end of file diff --git a/packages/test_selenium/galaxy/__init__.py b/packages/test_selenium/galaxy/__init__.py new file mode 100644 index 00000000000..69e3be50dac --- /dev/null +++ b/packages/test_selenium/galaxy/__init__.py @@ -0,0 +1 @@ +__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/packages/test_selenium/galaxy/project_galaxy_test_selenium.py b/packages/test_selenium/galaxy/project_galaxy_test_selenium.py new file mode 100644 index 00000000000..f9042bac1c0 --- /dev/null +++ b/packages/test_selenium/galaxy/project_galaxy_test_selenium.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- + +__version__ = '20.1.0.dev0' + +PROJECT_NAME = "galaxy-test-selenium" +PROJECT_OWNER = PROJECT_USERAME = "galaxyproject" +PROJECT_URL = "https://github.com/galaxyproject/galaxy" +PROJECT_AUTHOR = 'Galaxy Project and Community' +PROJECT_DESCRIPTION = 'Galaxy Selenium Tests' +PROJECT_EMAIL = 'galaxy-committers@lists.galaxyproject.org' +RAW_CONTENT_URL = "https://raw.github.com/%s/%s/master/" % ( + PROJECT_USERAME, PROJECT_NAME +) diff --git a/packages/test_selenium/galaxy_test/__init__.py b/packages/test_selenium/galaxy_test/__init__.py new file mode 100644 index 00000000000..69e3be50dac --- /dev/null +++ b/packages/test_selenium/galaxy_test/__init__.py @@ -0,0 +1 @@ +__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/packages/test_selenium/galaxy_test/selenium b/packages/test_selenium/galaxy_test/selenium new file mode 120000 index 00000000000..c1219582279 --- /dev/null +++ b/packages/test_selenium/galaxy_test/selenium @@ -0,0 +1 @@ +../../../lib/galaxy_test/selenium \ No newline at end of file diff --git a/packages/test_selenium/requirements.txt b/packages/test_selenium/requirements.txt new file mode 100644 index 00000000000..e8566b22706 --- /dev/null +++ b/packages/test_selenium/requirements.txt @@ -0,0 +1,4 @@ +galaxy-data +nose +pytest + diff --git a/packages/test_selenium/scripts b/packages/test_selenium/scripts new file mode 120000 index 00000000000..9aec9dc5a06 --- /dev/null +++ b/packages/test_selenium/scripts @@ -0,0 +1 @@ +../build_scripts \ No newline at end of file diff --git a/packages/test_selenium/setup.cfg b/packages/test_selenium/setup.cfg new file mode 120000 index 00000000000..eb7cf09393f --- /dev/null +++ b/packages/test_selenium/setup.cfg @@ -0,0 +1 @@ +../../setup.cfg \ No newline at end of file diff --git a/packages/test_selenium/setup.py b/packages/test_selenium/setup.py new file mode 100644 index 00000000000..dee400c2c05 --- /dev/null +++ b/packages/test_selenium/setup.py @@ -0,0 +1,100 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import ast +import os +import re +try: + from setuptools import setup +except ImportError: + from distutils.core import setup + +SOURCE_DIR = "galaxy" + +_version_re = re.compile(r'__version__\s+=\s+(.*)') + +project_short_name = os.path.basename(os.path.dirname(os.path.realpath(__file__))) +with open('%s/project_galaxy_%s.py' % (SOURCE_DIR, project_short_name), 'rb') as f: + init_contents = f.read().decode('utf-8') + + def get_var(var_name): + pattern = re.compile(r'%s\s+=\s+(.*)' % var_name) + match = pattern.search(init_contents).group(1) + return str(ast.literal_eval(match)) + + version = get_var("__version__") + PROJECT_NAME = get_var("PROJECT_NAME") + PROJECT_URL = get_var("PROJECT_URL") + PROJECT_AUTHOR = get_var("PROJECT_AUTHOR") + PROJECT_EMAIL = get_var("PROJECT_EMAIL") + PROJECT_DESCRIPTION = get_var("PROJECT_DESCRIPTION") + +TEST_DIR = 'tests' +PACKAGES = [ + 'galaxy_test', + 'galaxy_test.selenium', +] +ENTRY_POINTS = ''' + [console_scripts] +''' +PACKAGE_DATA = { + # Be sure to update MANIFEST.in for source dist. + 'galaxy': [ + ], +} +PACKAGE_DIR = { + SOURCE_DIR: SOURCE_DIR, + 'galaxy_test': 'galaxy_test', +} + +readme = open('README.rst').read() +history = open('HISTORY.rst').read().replace('.. :changelog:', '') + +if os.path.exists("requirements.txt"): + requirements = open("requirements.txt").read().split("\n") +else: + # In tox, it will cover them anyway. + requirements = [] + + +test_requirements = [ + # TODO: put package test requirements here +] + + +setup( + name=PROJECT_NAME, + version=version, + description=PROJECT_DESCRIPTION, + long_description=readme + '\n\n' + history, + long_description_content_type='text/x-rst', + author=PROJECT_AUTHOR, + author_email=PROJECT_EMAIL, + url=PROJECT_URL, + packages=PACKAGES, + entry_points=ENTRY_POINTS, + package_data=PACKAGE_DATA, + package_dir=PACKAGE_DIR, + include_package_data=True, + install_requires=requirements, + license="AFL", + zip_safe=False, + keywords='galaxy', + classifiers=[ + 'Development Status :: 5 - Production/Stable', + 'Intended Audience :: Developers', + 'Environment :: Console', + 'License :: OSI Approved :: Academic Free License (AFL)', + 'Operating System :: POSIX', + 'Topic :: Software Development', + 'Topic :: Software Development :: Testing', + 'Natural Language :: English', + "Programming Language :: Python :: 2", + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + ], + test_suite=TEST_DIR, + tests_require=test_requirements +) diff --git a/run_tests.sh b/run_tests.sh index 6424f29a61c..78ca1b2e911 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -1,3 +1,4 @@ + #!/bin/sh cd "$(dirname "$0")" @@ -9,11 +10,11 @@ cat <