Merge pull request #8960 from jmchilton/package_tests_1

Move galaxy testing utilities into cleaner package structure.

client/galaxy/scripts/mocha/tests/rules_dsl_spec.yml

@@ -1 +1 @@
-../../../../../test/base/data/rules_dsl_spec.yml
+../../../../../lib/galaxy_test/base/data/rules_dsl_spec.yml

lib/galaxy_test/driver/api.py

@@ -3,21 +3,21 @@ from contextlib import contextmanager
 
 from six.moves.urllib.parse import urlencode
 
-from .api_asserts import (
+from galaxy_test.base.api_asserts import (
     assert_error_code_is,
     assert_has_keys,
     assert_not_has_keys,
     assert_status_code_is,
     assert_status_code_is_ok,
 )
-from .api_util import (
+from galaxy_test.base.api_util import (
     ADMIN_TEST_USER,
     get_master_api_key,
     get_user_api_key,
     OTHER_USER,
     TEST_USER,
 )
-from .interactor import TestCaseGalaxyInteractor as BaseInteractor
+from galaxy_test.base.interactor import TestCaseGalaxyInteractor as BaseInteractor
 from .testcase import FunctionalTestCase
 
 

lib/galaxy_test/driver/driver_util.py

@@ -36,16 +36,16 @@ from galaxy.config import LOGGING_CONFIG_DEFAULT
 from galaxy.model import mapping
 from galaxy.model.tool_shed_install import mapping as toolshed_mapping
 from galaxy.tool_util.verify.interactor import GalaxyInteractorApi, verify_tool
-from galaxy.util import asbool, download_to_file
+from galaxy.util import asbool, download_to_file, galaxy_directory
 from galaxy.util.properties import load_app_properties
 from galaxy.web import buildapp
+from galaxy_test.base.api_util import get_master_api_key, get_user_api_key
+from galaxy_test.base.instrument import StructuredTestDataPlugin
+from galaxy_test.base.nose_util import run
 from tool_shed.webapp.app import UniverseApplication as ToolshedUniverseApplication
-from .api_util import get_master_api_key, get_user_api_key
-from .instrument import StructuredTestDataPlugin
-from .nose_util import run
 from .test_logging import logging_config_file
 
-galaxy_root = os.path.abspath(os.path.join(os.path.dirname(__file__), os.path.pardir, os.path.pardir))
+galaxy_root = galaxy_directory()
 DEFAULT_WEB_HOST = socket.gethostbyname('localhost')
 DEFAULT_CONFIG_PREFIX = "GALAXY"
 GALAXY_TEST_DIRECTORY = os.path.join(galaxy_root, "test")

scripts/functional_tests.py

@@ -12,8 +12,8 @@ import sys
 galaxy_root = os.path.abspath(os.path.join(os.path.dirname(__file__), os.path.pardir))
 sys.path[1:1] = [os.path.join(galaxy_root, "lib"), os.path.join(galaxy_root, "test")]
 
-from base import driver_util
-from base.api_util import get_master_api_key, get_user_api_key
+from galaxy_test.base.api_util import get_master_api_key, get_user_api_key
+from galaxy_test.driver import driver_util
 
 log = driver_util.build_logger()
 

setup.cfg

@@ -15,4 +15,4 @@ exclude = lib/galaxy/util/jstree.py
 # For flake8-import-order
 # https://github.com/PyCQA/flake8-import-order/blob/master/tests/test_cases/complete_smarkets.py
 import-order-style = smarkets
-application-import-names = galaxy,tool_shed
+application-import-names = galaxy,galaxy_test,tool_shed

test/api/test_api_batch.py

@@ -2,7 +2,7 @@ import json
 
 from requests import post
 
-from base import api  # noqa: I100,I202
+from galaxy_test.driver import api
 
 
 class ApiBatchTestCase(api.ApiTestCase):

test/api/test_authenticate.py

@@ -2,7 +2,7 @@ import base64
 
 from requests import get
 
-from base import api  # noqa: I100,I202
+from galaxy_test.driver import api
 
 TEST_USER_EMAIL = "auth_user_test@bx.psu.edu"
 TEST_USER_PASSWORD = "testpassword1"

test/api/test_configuration.py

@@ -1,11 +1,11 @@
-from base import api
-from base.api_asserts import (
+from galaxy_test.base.api_asserts import (
     assert_has_keys,
     assert_not_has_keys,
 )
-from base.populators import (
+from galaxy_test.base.populators import (
     LibraryPopulator
 )
+from galaxy_test.driver import api
 
 TEST_KEYS_FOR_ALL_USERS = [
     'enable_unique_workflow_defaults',

test/api/test_dataset_collections.py

@@ -1,10 +1,11 @@
 import json
 import tarfile
 
-from base import api
-from base.populators import DatasetCollectionPopulator, DatasetPopulator, skip_if_github_down
 from six import BytesIO
 
+from galaxy_test.base.populators import DatasetCollectionPopulator, DatasetPopulator, skip_if_github_down
+from galaxy_test.driver import api
+
 
 class DatasetCollectionApiTestCase(api.ApiTestCase):
 

test/api/test_datasets.py

@@ -2,11 +2,11 @@ from __future__ import print_function
 
 import textwrap
 
-from base import api
-from base.populators import (
+from galaxy_test.base.populators import (
     DatasetCollectionPopulator,
     DatasetPopulator,
 )
+from galaxy_test.driver import api
 
 
 class DatasetsApiTestCase(api.ApiTestCase):

test/api/test_datatypes.py

@@ -2,7 +2,7 @@ import time
 
 from requests import put
 
-from base import api  # noqa: I100,I202
+from galaxy_test.driver import api
 
 HIDDEN_DURING_UPLOAD_DATATYPE = "fli"
 

test/api/test_framework.py

@@ -1,6 +1,6 @@
 # This file doesn't test any API in particular but is meant to functionally
 # test the API framework itself.
-from base import api
+from galaxy_test.driver import api
 
 
 class ApiFrameworkTestCase(api.ApiTestCase):

test/api/test_galaxy_interactor.py

@@ -2,7 +2,7 @@
 
 from packaging.version import Version
 
-from base import api   # noqa: I100,I202
+from galaxy_test.driver import api
 
 
 class GalaxyInteractorBackwardCompatTestCase(api.ApiTestCase):

test/api/test_histories.py

@@ -6,11 +6,11 @@ from requests import (
     put
 )
 
-from base import api  # noqa: I100,I202
-from base.populators import (  # noqa: I100
+from galaxy_test.base.populators import (
     DatasetCollectionPopulator,
     DatasetPopulator,
 )
+from galaxy_test.driver import api
 
 
 class HistoriesApiTestCase(api.ApiTestCase):

test/api/test_history_contents.py

@@ -4,14 +4,14 @@ import json
 
 from requests import delete, put
 
-from base import api  # noqa: I100,I202
-from base.populators import (  # noqa: I100
+from galaxy_test.base.populators import (
     DatasetCollectionPopulator,
     DatasetPopulator,
     LibraryPopulator,
     skip_without_tool,
     TestsDatasets,
 )
+from galaxy_test.driver import api
 
 
 # TODO: Test anonymous access.

test/api/test_history_contents_provenance.py

@@ -1,5 +1,5 @@
-from base import api
-from base.populators import DatasetPopulator
+from galaxy_test.base.populators import DatasetPopulator
+from galaxy_test.driver import api
 
 
 class TestProvenance(api.ApiTestCase):

test/api/test_jobs.py

@@ -6,9 +6,8 @@ from operator import itemgetter
 
 import requests
 
-from base import api  # noqa: I100,I202
-from base.api_asserts import assert_status_code_is_ok  # noqa: I100
-from base.populators import (  # noqa: I100
+from galaxy_test.base.api_asserts import assert_status_code_is_ok
+from galaxy_test.base.populators import (
     DatasetCollectionPopulator,
     DatasetPopulator,
     skip_without_tool,
@@ -16,6 +15,7 @@ from base.populators import (  # noqa: I100
     wait_on,
     wait_on_state,
 )
+from galaxy_test.driver import api
 
 
 class JobsApiTestCase(api.ApiTestCase):

test/api/test_libraries.py

@@ -2,13 +2,13 @@ import json
 import time
 import unittest
 
-from base import api
-from base.populators import (
+from galaxy_test.base.populators import (
     DatasetCollectionPopulator,
     DatasetPopulator,
     LibraryPopulator,
     TestsDatasets,
 )
+from galaxy_test.driver import api
 
 FILE_URL = 'https://raw.githubusercontent.com/galaxyproject/galaxy/dev/test-data/4.bed'
 FILE_MD5 = "37b59762b59fff860460522d271bc111"

test/api/test_pages.py

@@ -1,8 +1,8 @@
 from requests import delete
 
-from base import api  # noqa: I100,I202
-from base.populators import DatasetPopulator
-from galaxy.exceptions import error_codes  # noqa: I201
+from galaxy.exceptions import error_codes
+from galaxy_test.base.populators import DatasetPopulator
+from galaxy_test.driver import api
 
 
 class BasePageApiTestCase(api.ApiTestCase):

test/api/test_roles.py

@@ -1,13 +1,13 @@
 import json
 
-from base import api
-from base.api_asserts import (
+from galaxy_test.base.api_asserts import (
     assert_has_keys,
     assert_status_code_is,
 )
-from base.populators import (  # noqa: I100
+from galaxy_test.base.populators import (
     DatasetPopulator,
 )
+from galaxy_test.driver import api
 
 
 class RolesApiTestCase(api.ApiTestCase):

test/api/test_search.py

@@ -1,7 +1,8 @@
-from base import api
-from base.populators import WorkflowPopulator
 from requests import delete
 
+from galaxy_test.base.populators import WorkflowPopulator
+from galaxy_test.driver import api
+
 
 class SearchApiTestCase(api.ApiTestCase):
 

test/api/test_tool_data.py

@@ -4,7 +4,7 @@ from __future__ import print_function
 
 import operator
 
-from base import api
+from galaxy_test.driver import api
 
 
 class ToolDataApiTestCase(api.ApiTestCase):

test/api/test_tools.py

@@ -5,9 +5,11 @@ import os
 import tarfile
 
 import pytest
-from base import api
-from base import rules_test_data
-from base.populators import (
+from requests import get
+from six import BytesIO
+
+from galaxy_test.base import rules_test_data
+from galaxy_test.base.populators import (
     DatasetCollectionPopulator,
     DatasetPopulator,
     LibraryPopulator,
@@ -15,8 +17,7 @@ from base.populators import (
     skip_without_tool,
     uses_test_history,
 )
-from requests import get
-from six import BytesIO
+from galaxy_test.driver import api
 
 
 MINIMAL_TOOL = {

test/api/test_tools_upload.py

@@ -1,19 +1,18 @@
 import json
 
-from base import api
-from base.constants import (
+from galaxy.tool_util.verify.test_data import TestDataResolver
+from galaxy_test.base.constants import (
     ONE_TO_SIX_ON_WINDOWS,
     ONE_TO_SIX_WITH_SPACES,
     ONE_TO_SIX_WITH_TABS,
 )
-from base.populators import (
+from galaxy_test.base.populators import (
     DatasetPopulator,
     skip_if_site_down,
     skip_without_datatype,
     uses_test_history,
 )
-
-from galaxy.tool_util.verify.test_data import TestDataResolver
+from galaxy_test.driver import api
 
 
 class ToolsUploadTestCase(api.ApiTestCase):

test/api/test_tours.py

@@ -1,4 +1,4 @@
-from base import api
+from galaxy_test.driver import api
 
 
 class TourApiTestCase(api.ApiTestCase):

test/api/test_users.py

@@ -6,8 +6,8 @@ from requests import (
     put
 )
 
-from base import api  # noqa: I100,I202
-from base.populators import skip_without_tool
+from galaxy_test.base.populators import skip_without_tool
+from galaxy_test.driver import api
 
 TEST_USER_EMAIL = "user_for_users_index_test@bx.psu.edu"
 TEST_USER_EMAIL_DELETE = "user_for_delete_test@bx.psu.edu"

test/api/test_visualizations.py

@@ -5,8 +5,8 @@ from requests import (
     put
 )
 
-from base import api  # noqa: I100,I202
-from base.api_asserts import assert_has_keys  # noqa: I100
+from galaxy_test.base.api_asserts import assert_has_keys
+from galaxy_test.driver import api
 
 INDEX_KEYS = [
     'id', 'title', 'type', 'dbkey', 'url'

test/api/test_webhooks.py

@@ -1,13 +1,10 @@
-from base import api
-from base.driver_util import TEST_WEBHOOKS_DIR
-from galaxy.webhooks import WebhooksRegistry  # noqa: I201
+from galaxy_test.driver import api
 
 
 class WebhooksApiTestCase(api.ApiTestCase):
 
     def setUp(self):
         super(WebhooksApiTestCase, self).setUp()
-        self.webhooks_registry = WebhooksRegistry(TEST_WEBHOOKS_DIR)
 
     def test_get_all(self):
         response = self._get('webhooks')

test/api/test_workflow_extraction.py

@@ -5,8 +5,7 @@ import operator
 from collections import namedtuple
 from json import dumps, loads
 
-from base.populators import skip_without_tool, summarize_instance_history_on_error
-
+from galaxy_test.base.populators import skip_without_tool, summarize_instance_history_on_error
 from .test_workflows import BaseWorkflowsApiTestCase
 
 

test/api/test_workflows.py

@@ -7,16 +7,16 @@ from uuid import uuid4
 
 from requests import delete, get, put
 
-from base import api  # noqa: I100,I202
-from base import rules_test_data  # noqa: I100
-from base.populators import (  # noqa: I100
+from galaxy.exceptions import error_codes
+from galaxy_test.base import rules_test_data
+from galaxy_test.base.populators import (
     DatasetCollectionPopulator,
     DatasetPopulator,
     skip_without_tool,
     wait_on,
     WorkflowPopulator
 )
-from base.workflow_fixtures import (  # noqa: I100
+from galaxy_test.base.workflow_fixtures import (
     WORKFLOW_NESTED_REPLACEMENT_PARAMETER,
     WORKFLOW_NESTED_RUNTIME_PARAMETER,
     WORKFLOW_NESTED_SIMPLE,
@@ -30,7 +30,7 @@ from base.workflow_fixtures import (  # noqa: I100
     WORKFLOW_WITH_OUTPUT_COLLECTION_MAPPING,
     WORKFLOW_WITH_RULES_1,
 )
-from galaxy.exceptions import error_codes  # noqa: I201
+from galaxy_test.driver import api
 
 
 NESTED_WORKFLOW_AUTO_LABELS = """

test/api/test_workflows_from_yaml.py

@@ -3,15 +3,14 @@ from __future__ import print_function
 import json
 import os
 
-from base.populators import uses_test_history
-from base.workflow_fixtures import (
+from galaxy_test.base.populators import uses_test_history
+from galaxy_test.base.workflow_fixtures import (
     WORKFLOW_RUNTIME_PARAMETER_SIMPLE,
     WORKFLOW_SIMPLE_CAT_AND_RANDOM_LINES,
     WORKFLOW_SIMPLE_CAT_TWICE,
     WORKFLOW_WITH_OUTPUT_ACTIONS,
     WORKFLOW_WITH_OUTPUTS
 )
-
 from .test_workflows import BaseWorkflowsApiTestCase
 
 WORKFLOWS_DIRECTORY = os.path.abspath(os.path.dirname(__file__))

test/functional/test_toolbox.py

@@ -8,11 +8,11 @@ except ImportError:
     def nottest(x):
         return x
 
-from base.driver_util import setup_keep_outdir, target_url_parts
-from base.instrument import register_job_data
-from base.testcase import FunctionalTestCase  # noqa: I100,I201,I202
-from galaxy.tool_util.verify.interactor import GalaxyInteractorApi, verify_tool  # noqa: I201
-from galaxy.tools import DataManagerTool  # noqa: I201
+from galaxy.tool_util.verify.interactor import GalaxyInteractorApi, verify_tool
+from galaxy.tools import DataManagerTool
+from galaxy_test.base.instrument import register_job_data
+from galaxy_test.driver.driver_util import setup_keep_outdir, target_url_parts
+from galaxy_test.driver.testcase import FunctionalTestCase
 
 log = logging.getLogger(__name__)
 

test/functional/test_toolbox_pytest.py

@@ -5,7 +5,8 @@ galaxy_root = os.path.abspath(os.path.join(os.path.dirname(__file__), os.path.pa
 sys.path[1:1] = [os.path.join(galaxy_root, "lib"), os.path.join(galaxy_root, "test")]
 
 import pytest
-from base import driver_util
+
+from galaxy_test.driver import driver_util
 
 SKIPTEST = os.path.join(os.path.dirname(__file__), 'known_broken_tools.txt')
 TEST_PREFIX = 'TestForTool_'

test/integration/objectstore/test_jobs.py

@@ -3,10 +3,10 @@
 import os
 import string
 
-from base import integration_util  # noqa: I202
-from base.populators import (
+from galaxy_test.base.populators import (
     DatasetPopulator,
 )
+from galaxy_test.driver import integration_util
 
 DISTRIBUTED_OBJECT_STORE_CONFIG_TEMPLATE = string.Template("""<?xml version="1.0"?>
 <object_store type="hierarchical">

test/integration/objectstore/test_selection.py

@@ -3,10 +3,10 @@
 import os
 import string
 
-from base import integration_util  # noqa: I202
-from base.populators import (
+from galaxy_test.base.populators import (
     DatasetPopulator,
 )
+from galaxy_test.driver import integration_util
 
 SCRIPT_DIRECTORY = os.path.abspath(os.path.dirname(__file__))
 JOB_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "selection_job_conf.xml")

test/integration/test_chained_dynamic_destinations.py

@@ -3,10 +3,9 @@
 import os
 import tempfile
 
-from base.populators import (
+from galaxy_test.base.populators import (
     skip_without_tool,
 )
-
 from .test_job_environments import BaseJobEnvironmentIntegrationTestCase
 
 SCRIPT_DIRECTORY = os.path.abspath(os.path.dirname(__file__))

test/integration/test_cli_runners.py

@@ -6,10 +6,10 @@ import subprocess
 import tempfile
 import unittest
 
-from base import integration_util  # noqa: I100,I202
-from base.populators import skip_without_tool
-from base.ssh_util import generate_ssh_keys
-from .test_job_environments import BaseJobEnvironmentIntegrationTestCase  # noqa: I201
+from galaxy_test.base.populators import skip_without_tool
+from galaxy_test.base.ssh_util import generate_ssh_keys
+from galaxy_test.driver import integration_util
+from .test_job_environments import BaseJobEnvironmentIntegrationTestCase
 
 
 RemoteConnection = collections.namedtuple('remote_connection', ['hostname', 'username', 'password', 'port', 'private_key', 'public_key'])

test/integration/test_config_defaults.py

@@ -3,9 +3,9 @@ from collections import namedtuple
 from datetime import timedelta
 
 import pytest
-from base.driver_util import GalaxyTestDriver
 
 from galaxy.util import listify
+from galaxy_test.driver.driver_util import GalaxyTestDriver
 
 
 """

test/integration/test_config_options_users.py

@@ -1,6 +1,6 @@
 """Integration tests for user config options."""
 
-from base import integration_util
+from galaxy_test.driver import integration_util
 
 
 class _BaseUserExposeIntegerationTestCase(integration_util.IntegrationTestCase):

test/integration/test_containerized_jobs.py

@@ -3,12 +3,11 @@
 import os
 import unittest
 
-from base import integration_util
-from base.populators import (
+from galaxy.tool_util.deps.commands import which
+from galaxy_test.base.populators import (
     DatasetPopulator,
 )
-
-from galaxy.tool_util.deps.commands import which
+from galaxy_test.driver import integration_util
 from .test_job_environments import RunsEnvironmentJobs
 
 SCRIPT_DIRECTORY = os.path.abspath(os.path.dirname(__file__))

test/integration/test_data_manager.py

@@ -1,10 +1,10 @@
 import random
 import string
 
-from base import integration_util
-from base.populators import DatasetPopulator, skip_if_toolshed_down
 from nose.plugins.skip import SkipTest
 
+from galaxy_test.base.populators import DatasetPopulator, skip_if_toolshed_down
+from galaxy_test.driver import integration_util
 from .uses_shed import CONDA_AUTO_INSTALL_JOB_TIMEOUT, UsesShed
 
 FETCH_TOOL_ID = 'toolshed.g2.bx.psu.edu/repos/devteam/data_manager_fetch_genome_dbkeys_all_fasta/data_manager_fetch_genome_all_fasta_dbkey/0.0.2'

test/integration/test_datatype_upload.py

@@ -4,14 +4,14 @@ import tempfile
 
 import pytest
 
-from base import integration_util  # noqa: I100,I202
-from galaxy.datatypes.registry import Registry  # noqa: I201
+from galaxy.datatypes.registry import Registry
 from galaxy.util.checkers import (
     is_bz2,
     is_gzip,
     is_zip
 )
 from galaxy.util.hash_util import md5_hash_file
+from galaxy_test.driver import integration_util
 from .test_upload_configuration_options import BaseUploadContentConfigurationInstance
 
 SCRIPT_DIRECTORY = os.path.abspath(os.path.dirname(__file__))

test/integration/test_fail_job_tool_unavailable.py

@@ -1,10 +1,10 @@
 import time
 
-from base import integration_util
-from base.populators import (
+from galaxy_test.base.populators import (
     DatasetPopulator,
     WorkflowPopulator,
 )
+from galaxy_test.driver import integration_util
 
 
 class FailJobWhenToolUnavailableTestCase(integration_util.IntegrationTestCase):

test/integration/test_handler_assignment_methods.py

@@ -2,7 +2,7 @@
 
 import os
 
-from base import integration_util
+from galaxy_test.driver import integration_util
 
 SCRIPT_DIRECTORY = os.path.abspath(os.path.dirname(__file__))
 HANDLER_TEMPLATE_JOB_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "handler_template_job_conf.xml")

test/integration/test_interactivetools_api.py

@@ -3,12 +3,12 @@
 import os
 
 import requests
-from base import api_asserts
-from base.populators import (
+
+from galaxy_test.base import api_asserts
+from galaxy_test.base.populators import (
     DatasetPopulator,
     wait_on,
 )
-
 from .test_containerized_jobs import ContainerizedIntegrationTestCase
 
 SCRIPT_DIRECTORY = os.path.abspath(os.path.dirname(__file__))

test/integration/test_job_environments.py

@@ -4,11 +4,11 @@ import collections
 import os
 import tempfile
 
-from base import integration_util
-from base.populators import (
+from galaxy_test.base.populators import (
     DatasetPopulator,
     skip_without_tool,
 )
+from galaxy_test.driver import integration_util
 
 SCRIPT_DIRECTORY = os.path.abspath(os.path.dirname(__file__))
 SIMPLE_JOB_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "simple_job_conf.xml")

test/integration/test_job_recovery.py

@@ -2,10 +2,10 @@
 
 import os
 
-from base import integration_util  # noqa: I202
-from base.populators import (
+from galaxy_test.base.populators import (
     DatasetPopulator,
 )
+from galaxy_test.driver import integration_util
 
 SCRIPT_DIRECTORY = os.path.abspath(os.path.dirname(__file__))
 DELAY_JOB_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "delay_job_conf.yml")

test/integration/test_job_resubmission.py

@@ -2,7 +2,7 @@
 
 import os
 
-from base import integration_util
+from galaxy_test.driver import integration_util
 
 SCRIPT_DIRECTORY = os.path.abspath(os.path.dirname(__file__))
 JOB_RESUBMISSION_JOB_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "resubmission_job_conf.yml")

test/integration/test_kubernetes_runner.py

@@ -10,10 +10,10 @@ import time
 
 import pytest
 
-from base import integration_util  # noqa: I100,I202
-from base.populators import skip_without_tool
-from .test_containerized_jobs import MulledJobTestCases  # noqa: I201
-from .test_job_environments import BaseJobEnvironmentIntegrationTestCase  # noqa: I201
+from galaxy_test.base.populators import skip_without_tool
+from galaxy_test.driver import integration_util
+from .test_containerized_jobs import MulledJobTestCases
+from .test_job_environments import BaseJobEnvironmentIntegrationTestCase
 
 PERSISTENT_VOLUME_NAME = 'pv-galaxy-integration-test'
 PERSISTENT_VOLUME_CLAIM_NAME = 'galaxy-pvc-integration-test'

test/integration/test_kubernetes_staging.py

@@ -15,10 +15,10 @@ import os
 import string
 import tempfile
 
-from base import integration_util  # noqa: I100,I202
-from base.populators import skip_without_tool
-from .test_containerized_jobs import EXTENDED_TIMEOUT, MulledJobTestCases  # noqa: I201
-from .test_job_environments import BaseJobEnvironmentIntegrationTestCase  # noqa: I201
+from galaxy_test.base.populators import skip_without_tool
+from galaxy_test.driver import integration_util
+from .test_containerized_jobs import EXTENDED_TIMEOUT, MulledJobTestCases
+from .test_job_environments import BaseJobEnvironmentIntegrationTestCase
 
 TOOL_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, 'tools'))
 AMQP_URL = os.environ.get("GALAXY_TEST_AMQP_URL", "amqp://guest:guest@localhost:5672//")

test/integration/test_local_job_cancellation.py

@@ -4,10 +4,10 @@ import time
 
 import psutil
 
-from base import integration_util  # noqa: I202
-from base.populators import (
+from galaxy_test.base.populators import (
     DatasetPopulator,
 )
+from galaxy_test.driver import integration_util
 
 
 class LocalJobCancellationTestCase(integration_util.IntegrationTestCase):

test/integration/test_mules_as_job_handlers.py

@@ -2,8 +2,8 @@
 
 import os
 
-from base import integration_util
-from base.populators import DatasetPopulator
+from galaxy_test.base.populators import DatasetPopulator
+from galaxy_test.driver import integration_util
 
 SCRIPT_DIRECTORY = os.path.abspath(os.path.dirname(__file__))
 

test/integration/test_page_revision_json_encoding.py

@@ -5,12 +5,12 @@ the security parameter to encode IDs may be changed by admins). Test case also v
 exported API values are encoded though.
 """
 
-from base import api_asserts
-from base import integration_util
-from base.populators import (
+from galaxy import model
+from galaxy_test.base import api_asserts
+from galaxy_test.base.populators import (
     DatasetPopulator,
 )
-from galaxy import model  # noqa: I101,I201
+from galaxy_test.driver import integration_util
 
 
 class PageJsonEncodingIntegrationTestCase(integration_util.IntegrationTestCase):

test/integration/test_pulsar_embedded.py

@@ -2,7 +2,7 @@
 
 import os
 
-from base import integration_util
+from galaxy_test.driver import integration_util
 
 SCRIPT_DIRECTORY = os.path.abspath(os.path.dirname(__file__))
 EMBEDDED_PULSAR_JOB_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "embedded_pulsar_job_conf.xml")

test/integration/test_pulsar_embedded_containers.py

@@ -1,10 +1,10 @@
 import os
 
-from base import integration_util  # noqa: I100,I202
-from base.populators import (
+from galaxy_test.base.populators import (
     DatasetPopulator,
 )
-from .test_containerized_jobs import (  # noqa: I201
+from galaxy_test.driver import integration_util
+from .test_containerized_jobs import (
     disable_dependency_resolution,
     MulledJobTestCases,
     skip_if_container_type_unavailable,

test/integration/test_pulsar_embedded_copy_working.py

@@ -2,7 +2,7 @@
 
 import os
 
-from base import integration_util
+from galaxy_test.driver import integration_util
 
 SCRIPT_DIRECTORY = os.path.abspath(os.path.dirname(__file__))
 EMBEDDED_PULSAR_JOB_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "embedded_pulsar_job_conf.yml")

test/integration/test_pulsar_embedded_metadata.py

@@ -2,7 +2,7 @@
 
 import os
 
-from base import integration_util
+from galaxy_test.driver import integration_util
 
 SCRIPT_DIRECTORY = os.path.abspath(os.path.dirname(__file__))
 EMBEDDED_PULSAR_JOB_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "embedded_pulsar_metadata_job_conf.yml")

test/integration/test_resolvers.py

@@ -2,10 +2,10 @@
 import os
 from tempfile import mkdtemp
 
-from base import integration_util
-from base.populators import (
+from galaxy_test.base.populators import (
     DatasetPopulator,
 )
+from galaxy_test.driver import integration_util
 
 GNUPLOT = {u'version': u'4.6', u'type': u'package', u'name': u'gnuplot'}
 

test/integration/test_scripts.py

@@ -8,13 +8,13 @@ import tempfile
 import unittest
 
 import yaml
-from base import integration_util
-from base.populators import DatasetPopulator
 
 from galaxy.util import (
     galaxy_directory,
     unicodify
 )
+from galaxy_test.base.populators import DatasetPopulator
+from galaxy_test.driver import integration_util
 
 
 def skip_unless_module(module):

test/integration/test_shed_tool_tests.py

@@ -1,6 +1,5 @@
-from base import integration_util
-from base.populators import skip_if_toolshed_down
-
+from galaxy_test.base.populators import skip_if_toolshed_down
+from galaxy_test.driver import integration_util
 from .uses_shed import UsesShed
 
 

test/integration/test_upload_configuration_options.py

@@ -26,20 +26,20 @@ import shutil
 import tempfile
 import unittest
 
-from base import integration_util
-from base.api_util import (
+from galaxy_test.base.api_util import (
     TEST_USER,
 )
-from base.constants import (
+from galaxy_test.base.constants import (
     ONE_TO_SIX_ON_WINDOWS,
     ONE_TO_SIX_WITH_SPACES,
     ONE_TO_SIX_WITH_TABS,
 )
-from base.populators import (
+from galaxy_test.base.populators import (
     DatasetPopulator,
     LibraryPopulator,
     skip_without_datatype,
 )
+from galaxy_test.driver import integration_util
 
 
 SCRIPT_DIR = os.path.normpath(os.path.dirname(__file__))

test/integration/test_work_queue_put_failure.py

@@ -1,7 +1,7 @@
 import tempfile
 
-from base import integration_util
-from base.populators import DatasetPopulator
+from galaxy_test.base.populators import DatasetPopulator
+from galaxy_test.driver import integration_util
 
 job_conf_yaml = """
 runners:

test/integration/test_workflow_handler_configuration.py

@@ -4,11 +4,11 @@ import os
 import re
 from json import dumps
 
-from base import integration_util
-from base.populators import (
+from galaxy_test.base.populators import (
     DatasetPopulator,
     WorkflowPopulator,
 )
+from galaxy_test.driver import integration_util
 
 SCRIPT_DIRECTORY = os.path.abspath(os.path.dirname(__file__))
 WORKFLOW_HANDLER_CONFIGURATION_JOB_CONF = os.path.join(SCRIPT_DIRECTORY, "workflow_handler_configuration_job_conf.xml")

test/integration/test_workflow_scheduling_options.py

@@ -3,12 +3,12 @@
 import time
 from json import dumps
 
-from base import integration_util
-from base.populators import (
+from galaxy_test.base.populators import (
     DatasetCollectionPopulator,
     DatasetPopulator,
     WorkflowPopulator,
 )
+from galaxy_test.driver import integration_util
 
 
 class MaximumWorkflowInvocationDurationTestCase(integration_util.IntegrationTestCase):

test/integration/test_workflow_sync.py

@@ -5,12 +5,12 @@ import os
 
 import yaml
 
-from base import integration_util  # noqa: I100,I202
-from base.populators import (  # noqa: I100
+from galaxy_test.base.populators import (
     DatasetPopulator,
     WorkflowPopulator,
 )
-from base.workflow_fixtures import WORKFLOW_SIMPLE_CAT_TWICE  # noqa: I100
+from galaxy_test.base.workflow_fixtures import WORKFLOW_SIMPLE_CAT_TWICE
+from galaxy_test.driver import integration_util
 
 
 class WorkflowSyncTestCase(integration_util.IntegrationTestCase):

test/integration/uses_shed.py

@@ -2,8 +2,8 @@ import os
 import string
 import tempfile
 
-from base.driver_util import FRAMEWORK_UPLOAD_TOOL_CONF
-from base.populators import DEFAULT_TIMEOUT
+from galaxy_test.base.populators import DEFAULT_TIMEOUT
+from galaxy_test.driver.driver_util import FRAMEWORK_UPLOAD_TOOL_CONF
 
 # Needs a longer timeout because of the conda_auto_install.
 CONDA_AUTO_INSTALL_JOB_TIMEOUT = DEFAULT_TIMEOUT * 3

test/manual/gen_history_export_test_artifacts.py

@@ -8,7 +8,7 @@ from bioblend import galaxy
 galaxy_root = os.path.abspath(os.path.join(os.path.dirname(__file__), os.path.pardir, os.path.pardir))
 sys.path[1:1] = [os.path.join(galaxy_root, "lib"), os.path.join(galaxy_root, "test")]
 
-from base.populators import (  # noqa: I100,I202
+from galaxy_test.base.populators import (
     GiDatasetPopulator,
 )
 

test/manual/workflows_scaling.py

@@ -20,7 +20,7 @@ from gxformat2 import python_to_workflow
 galaxy_root = os.path.abspath(os.path.join(os.path.dirname(__file__), os.path.pardir, os.path.pardir))
 sys.path[1:1] = [os.path.join(galaxy_root, "lib"), os.path.join(galaxy_root, "test")]
 
-from base.populators import (  # noqa: I100,I202
+from galaxy_test.base.populators import (
     GiDatasetCollectionPopulator,
     GiDatasetPopulator,
     GiWorkflowPopulator,

test/selenium_tests/framework.py

@@ -20,18 +20,18 @@ except ImportError:
     Display = None
 from six.moves.urllib.parse import urljoin
 
-from base import populators  # noqa: I100,I202
-from base.api import UsesApiTestCaseMixin  # noqa: I100
-from base.driver_util import classproperty, DEFAULT_WEB_HOST, get_ip_address  # noqa: I100
-from base.testcase import FunctionalTestCase  # noqa: I100
-from galaxy.selenium import (  # noqa: I100,I201
+from galaxy.selenium import (
     driver_factory,
 )
-from galaxy.selenium.navigates_galaxy import (  # noqa: I100
+from galaxy.selenium.navigates_galaxy import (
     NavigatesGalaxy,
     retry_during_transitions
 )
-from galaxy.util import asbool  # noqa: I201
+from galaxy.util import asbool
+from galaxy_test.base import populators
+from galaxy_test.driver.api import UsesApiTestCaseMixin
+from galaxy_test.driver.driver_util import classproperty, DEFAULT_WEB_HOST, get_ip_address
+from galaxy_test.driver.testcase import FunctionalTestCase
 
 DEFAULT_TIMEOUT_MULTIPLIER = 1
 DEFAULT_TEST_ERRORS_DIRECTORY = os.path.abspath("database/test_errors")

test/selenium_tests/test_history_panel_collections.py

@@ -1,8 +1,7 @@
 import time
 
-from base.api_asserts import assert_status_code_is
-from base.populators import flakey
-
+from galaxy_test.base.api_asserts import assert_status_code_is
+from galaxy_test.base.populators import flakey
 from .framework import (
     retry_assertion_during_transitions,
     selenium_test,

test/selenium_tests/test_history_panel_pagination.py

@@ -1,5 +1,4 @@
-from base.populators import flakey
-
+from galaxy_test.base.populators import flakey
 from .framework import (
     selenium_test,
     SeleniumTestCase

test/selenium_tests/test_jupyter.py

@@ -1,5 +1,4 @@
-from base.populators import flakey
-
+from galaxy_test.base.populators import flakey
 from .framework import (
     managed_history,
     selenium_test,