Move some unit test helper modules into galaxy-app

test/unit/unittest_utils/galaxy_mock.py → lib/galaxy/app_unittest_utils/galaxy_mock.py

@@ -25,7 +25,7 @@
 from galaxy.util.bunch import Bunch
 from galaxy.util.dbkeys import GenomeBuilds
 from galaxy.web_stack import ApplicationStack
-from galaxy_test.base.celery_helper import rebind_container_to_task
+from .celery_helper import rebind_container_to_task
 
 
 # =============================================================================

test/unit/tools_support.py → lib/galaxy/app_unittest_utils/tools_support.py

@@ -11,10 +11,10 @@
 
 import galaxy.datatypes.registry
 import galaxy.model
+from galaxy.app_unittest_utils.galaxy_mock import MockApp
 from galaxy.tool_util.parser import get_tool_source
 from galaxy.tools import create_tool_from_source
 from galaxy.util.bunch import Bunch
-from .unittest_utils import galaxy_mock
 
 
 datatypes_registry = galaxy.datatypes.registry.Registry()
@@ -26,7 +26,7 @@ class UsesApp:
 
     def setup_app(self):
         self.test_directory = tempfile.mkdtemp()
-        self.app = galaxy_mock.MockApp()
+        self.app = MockApp()
         self.app.config.new_file_path = os.path.join(self.test_directory, "new_files")
         self.app.config.admin_users = "mary@example.com"
         self.app.job_search = None

lib/galaxy_test/driver/driver_util.py

@@ -26,6 +26,7 @@
 from paste import httpserver
 
 from galaxy.app import UniverseApplication as GalaxyUniverseApplication
+from galaxy.app_unittest_utils.celery_helper import rebind_container_to_task
 from galaxy.config import LOGGING_CONFIG_DEFAULT
 from galaxy.model import mapping
 from galaxy.model.database_utils import create_database, database_exists
@@ -35,7 +36,6 @@
 from galaxy.util.properties import load_app_properties
 from galaxy.webapps.galaxy import buildapp
 from galaxy_test.base.api_util import get_admin_api_key, get_user_api_key
-from galaxy_test.base.celery_helper import rebind_container_to_task
 from galaxy_test.base.env import (
     DEFAULT_WEB_HOST,
     target_url_parts,

packages/app/galaxy/app_unittest_utils

@@ -0,0 +1 @@
+../../../lib/galaxy/app_unittest_utils/

packages/app/setup.py

@@ -32,6 +32,7 @@ def get_var(var_name):
 PACKAGES = [
     'galaxy',
     'galaxy.actions',
+    'galaxy.app_unittest_utils',
     'galaxy.config',
     'galaxy.files',
     'galaxy.files.sources',

test/unit/authnz/test_custos_authnz.py

@@ -13,10 +13,10 @@
 import jwt
 import requests
 
+from galaxy.app_unittest_utils.galaxy_mock import MockTrans
 from galaxy.authnz import custos_authnz
 from galaxy.model import CustosAuthnzToken, User
 from galaxy.util import unicodify
-from ..unittest_utils.galaxy_mock import MockTrans
 
 
 class CustosAuthnzTestCase(unittest.TestCase):

test/unit/jobs/test_job_wrapper.py

@@ -2,6 +2,7 @@
 from contextlib import contextmanager
 from unittest import TestCase
 
+from galaxy.app_unittest_utils.tools_support import UsesApp
 from galaxy.jobs import (
     JobWrapper,
     TaskWrapper
@@ -13,7 +14,6 @@
 )
 from galaxy.tools import evaluation
 from galaxy.util.bunch import Bunch
-from ..tools_support import UsesApp
 
 TEST_TOOL_ID = "cufftest"
 TEST_VERSION_COMMAND = "bwa --version"

test/unit/jobs/test_runner_local.py

@@ -7,12 +7,12 @@
 
 from galaxy import job_metrics
 from galaxy import model
-from galaxy.jobs.runners import local
-from galaxy.util import bunch
-from ..tools_support import (
+from galaxy.app_unittest_utils.tools_support import (
     UsesApp,
-    UsesTools
+    UsesTools,
 )
+from galaxy.jobs.runners import local
+from galaxy.util import bunch
 
 
 class TestLocalJobRunner(TestCase, UsesApp, UsesTools):

test/unit/managers/base.py

@@ -6,8 +6,8 @@
 
 import sqlalchemy
 
+from galaxy.app_unittest_utils import galaxy_mock
 from galaxy.managers.users import UserManager
-from ..unittest_utils import galaxy_mock
 
 # =============================================================================
 admin_email = 'admin@admin.admin'

test/unit/managers/test_HistoryManager.py

@@ -10,6 +10,7 @@
     exceptions,
     model
 )
+from galaxy.app_unittest_utils import galaxy_mock
 from galaxy.managers import (
     base,
     hdas
@@ -21,7 +22,6 @@
     HistorySerializer
 )
 from .base import BaseTestCase
-from ..unittest_utils import galaxy_mock
 
 default_password = '123456'
 user2_data = dict(email='user2@user2.user2', username='user2', password=default_password)

test/unit/queue_worker/conftest.py

@@ -8,8 +8,8 @@
 except ImportError:
     psycopg2 = None
 
+from galaxy.app_unittest_utils import galaxy_mock
 from galaxy.util import which
-from ..unittest_utils import galaxy_mock
 
 
 def create_base_test(connection, amqp_type, amqp_connection=None):

test/unit/tools/test_actions.py

@@ -2,6 +2,7 @@
 import unittest
 
 from galaxy import model
+from galaxy.app_unittest_utils import tools_support
 from galaxy.exceptions import UserActivationRequiredException
 from galaxy.tool_util.parser.output_objects import ToolOutput
 from galaxy.tools.actions import (
@@ -10,7 +11,6 @@
     on_text_for_names
 )
 from galaxy.util import XML
-from .. import tools_support
 
 
 # I cannot think of a saner way to test if data is being wrapped than use a

test/unit/tools/test_collect_primary_datasets.py

@@ -6,9 +6,9 @@
     model,
     util
 )
+from galaxy.app_unittest_utils import tools_support
 from galaxy.tool_util.parser import output_collection_def
 from galaxy.tool_util.provided_metadata import LegacyToolProvidedMetadata, NullToolProvidedMetadata
-from .. import tools_support
 
 DEFAULT_TOOL_OUTPUT = "out1"
 DEFAULT_EXTRA_NAME = "test1"

test/unit/tools/test_column_parameters.py

@@ -2,9 +2,9 @@
 test_select_parameters.py.
 """
 from galaxy import model
+from galaxy.app_unittest_utils.tools_support import datatypes_registry
 from galaxy.util import bunch
 from .util import BaseParameterTestCase
-from ..tools_support import datatypes_registry
 
 
 class DataColumnParameterTestCase(BaseParameterTestCase):

test/unit/tools/test_data_parameters.py

@@ -1,6 +1,6 @@
 from galaxy import model
+from galaxy.app_unittest_utils import galaxy_mock
 from .util import BaseParameterTestCase
-from ..unittest_utils import galaxy_mock
 
 
 class DataToolParameterTestCase(BaseParameterTestCase):

test/unit/tools/test_dataset_matcher.py

@@ -1,6 +1,7 @@
 from unittest import TestCase
 
 from galaxy import model
+from galaxy.app_unittest_utils.tools_support import UsesApp
 from galaxy.tools.parameters import (
     basic,
     dataset_matcher
@@ -10,7 +11,6 @@
     XML,
 )
 from .test_data_parameters import MockHistoryDatasetAssociation
-from ..tools_support import UsesApp
 
 
 class DatasetMatcherTestCase(TestCase, UsesApp):

test/unit/tools/test_evaluation.py

@@ -1,6 +1,7 @@
 import os
 from unittest import TestCase
 
+from galaxy.app_unittest_utils.tools_support import UsesApp
 from galaxy.job_execution.datasets import DatasetPath
 from galaxy.jobs import SimpleComputeEnvironment
 from galaxy.model import (
@@ -28,8 +29,6 @@
 )
 from galaxy.util import XML
 from galaxy.util.bunch import Bunch
-# Test fixtures for Galaxy infrastructure.
-from ..tools_support import UsesApp
 
 # To Test:
 # - param_file handling.

test/unit/tools/test_execution.py

@@ -6,9 +6,9 @@
 import webob.exc
 
 import galaxy.model
+from galaxy.app_unittest_utils import tools_support
 from galaxy.tools.parameters import params_to_incoming
 from galaxy.util.bunch import Bunch
-from .. import tools_support
 
 BASE_REPEAT_TOOL_CONTENTS = '''<tool id="test_tool" name="Test Tool">
     <command>echo "$param1" #for $r in $repeat# "$r.param2" #end for# &lt; $out1</command>

test/unit/tools/test_history_imp_exp.py

@@ -5,13 +5,13 @@
 from shutil import rmtree
 
 from galaxy import model
+from galaxy.app_unittest_utils.galaxy_mock import MockApp
 from galaxy.exceptions import MalformedContents
 from galaxy.objectstore.unittest_utils import (
     Config as TestConfig,
 )
 from galaxy.tools.imp_exp import JobExportHistoryArchiveWrapper, JobImportHistoryArchiveWrapper, unpack_tar_gz_archive
 from galaxy.tools.imp_exp.export_history import create_archive
-from ..unittest_utils.galaxy_mock import MockApp
 
 
 # good enough for the very specific tests we're writing as of now...

test/unit/tools/test_metadata.py

@@ -3,11 +3,11 @@
 import unittest
 
 from galaxy import model
+from galaxy.app_unittest_utils import tools_support
 from galaxy.job_execution.datasets import DatasetPath
 from galaxy.metadata import get_metadata_compute_strategy
 from galaxy.objectstore import ObjectStorePopulator
 from galaxy.util import safe_makedirs
-from .. import tools_support
 
 
 class MetadataTestCase(unittest.TestCase, tools_support.UsesApp, tools_support.UsesTools):

test/unit/tools/test_tool_validation.py

@@ -4,10 +4,10 @@
 import tempfile
 from contextlib import contextmanager
 
+from galaxy.app_unittest_utils.galaxy_mock import MockApp
 from galaxy.tools.repositories import ValidationContext
 from galaxy.util import galaxy_directory
 from tool_shed.tools.tool_validator import ToolValidator
-from ..unittest_utils.galaxy_mock import MockApp
 
 BISMARK_TAR = os.path.join(galaxy_directory(), 'lib/tool_shed/test/test_data/bismark/bismark.tar')
 BOWTIE2_INDICES = os.path.join(galaxy_directory(), 'lib/tool_shed/test/test_data/bowtie2_loc_sample/bowtie2_indices.loc.sample')

test/unit/tools/test_toolbox.py

@@ -10,14 +10,14 @@
 import routes
 
 from galaxy import model
+from galaxy.app_unittest_utils.tools_support import UsesApp, UsesTools
 from galaxy.config_watchers import ConfigWatchers
 from galaxy.model import tool_shed_install
 from galaxy.model.tool_shed_install import mapping
 from galaxy.tool_util.unittest_utils import mock_trans
 from galaxy.tool_util.unittest_utils.sample_data import SIMPLE_MACRO, SIMPLE_TOOL_WITH_MACRO
 from galaxy.tools import ToolBox
 from galaxy.tools.cache import ToolCache
-from ..tools_support import UsesApp, UsesTools
 
 log = logging.getLogger(__name__)
 

test/unit/tools/util.py

@@ -1,12 +1,12 @@
 from unittest import TestCase
 
 from galaxy import model
+from galaxy.app_unittest_utils.tools_support import UsesApp
 from galaxy.tools.parameters import basic
 from galaxy.util import (
     bunch,
     XML,
 )
-from ..tools_support import UsesApp
 
 
 class BaseParameterTestCase(TestCase, UsesApp):

test/unit/visualizations/plugins/test_VisualizationPlugin.py

@@ -3,14 +3,14 @@
 """
 import unittest
 
+from galaxy.app_unittest_utils import galaxy_mock
 from galaxy.util import clean_multiline_string
 from galaxy.visualization.plugins import (
     plugin as vis_plugin,
     resource_parser,
     utils as vis_utils
 )
 from . import VisualizationsBase_TestCase
-from ...unittest_utils import galaxy_mock
 
 
 class VisualizationsPlugin_TestCase(VisualizationsBase_TestCase):

test/unit/visualizations/plugins/test_VisualizationsRegistry.py

@@ -6,11 +6,11 @@
 import unittest
 
 from galaxy import model
+from galaxy.app_unittest_utils import galaxy_mock
 from galaxy.util import clean_multiline_string, galaxy_directory
 from galaxy.visualization.plugins import plugin
 from galaxy.visualization.plugins.registry import VisualizationsRegistry
 from . import VisualizationsBase_TestCase
-from ...unittest_utils import galaxy_mock
 
 glx_dir = galaxy_directory()
 template_cache_dir = os.path.join(glx_dir, 'database', 'compiled_templates')

test/unit/webapps/test_request_scoped_sqlalchemy_sessions.py

@@ -12,9 +12,8 @@
 pytest.importorskip("starlette_context")
 from starlette_context import context as request_context
 
-
+from galaxy.app_unittest_utils.galaxy_mock import MockApp
 from galaxy.webapps.galaxy.fast_app import add_request_id_middleware
-from ..unittest_utils.galaxy_mock import MockApp
 
 app = FastAPI()
 GX_APP = None

test/unit/webapps/test_webapp_base.py

@@ -6,8 +6,8 @@
 import unittest
 
 import galaxy.config
+from galaxy.app_unittest_utils import galaxy_mock
 from galaxy.webapps.base import webapp as Webapp
-from ..unittest_utils import galaxy_mock
 
 log = logging.getLogger(__name__)