Move tools/verify/ into tool_util/verify/

Ref: https://github.com/galaxyproject/galaxy/issues/8073

lib/galaxy/tool_util/verify/script.py

@@ -5,7 +5,10 @@ import argparse
 import json
 import sys
 
-from galaxy.tools.verify.interactor import GalaxyInteractorApi, verify_tool
+from .interactor import (
+    GalaxyInteractorApi,
+    verify_tool,
+)
 
 DESCRIPTION = """Script to quickly run a tool test against a running Galaxy instance."""
 ALL_TESTS = "*all_tests*"

lib/galaxy/tools/test.py

@@ -4,9 +4,9 @@ import os.path
 
 from six import string_types
 
+from galaxy.tool_util.verify.interactor import ToolTestDescription
 import galaxy.tools.parameters.basic
 import galaxy.tools.parameters.grouping
-from galaxy.tools.verify.interactor import ToolTestDescription
 from galaxy.util import (
     string_as_bool,
     unicodify,

test/api/test_tools_upload.py

@@ -12,7 +12,7 @@ from base.populators import (
     uses_test_history,
 )
 
-from galaxy.tools.verify.test_data import TestDataResolver
+from galaxy.tool_util.verify.test_data import TestDataResolver
 
 
 class ToolsUploadTestCase(api.ApiTestCase):

test/base/driver_util.py

@@ -34,7 +34,7 @@ from galaxy.app import UniverseApplication as GalaxyUniverseApplication
 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.tools.verify.interactor import GalaxyInteractorApi, verify_tool
+from galaxy.tool_util.verify.interactor import GalaxyInteractorApi, verify_tool
 from galaxy.util import asbool, download_to_file
 from galaxy.util.properties import load_app_properties
 from galaxy.web import buildapp

test/base/integration_util.py

@@ -10,7 +10,7 @@ from unittest import skip, SkipTest, TestCase
 import pytest
 
 from galaxy.tool_util.deps.commands import which
-from galaxy.tools.verify.test_data import TestDataResolver
+from galaxy.tool_util.verify.test_data import TestDataResolver
 from .api import UsesApiTestCaseMixin
 from .driver_util import GalaxyTestDriver
 

test/base/interactor.py

@@ -1,4 +1,4 @@
-from galaxy.tools.verify.interactor import GalaxyInteractorApi
+from galaxy.tool_util.verify.interactor import GalaxyInteractorApi
 
 
 class TestCaseGalaxyInteractor(GalaxyInteractorApi):

test/base/populators.py

@@ -23,7 +23,7 @@ from gxformat2 import (
 from pkg_resources import resource_string
 from six import StringIO
 
-from galaxy.tools.verify.test_data import TestDataResolver
+from galaxy.tool_util.verify.test_data import TestDataResolver
 from galaxy.util import unicodify
 from . import api_asserts
 

test/base/testcase.py

@@ -5,7 +5,7 @@ import os
 import unittest
 
 from galaxy.security import idencoding
-from galaxy.tools.verify.test_data import TestDataResolver
+from galaxy.tool_util.verify.test_data import TestDataResolver
 from .driver_util import GalaxyTestDriver, setup_keep_outdir, target_url_parts
 
 log = logging.getLogger(__name__)

test/functional/test_toolbox.py

@@ -11,8 +11,8 @@ except ImportError:
 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.tools.verify.interactor import GalaxyInteractorApi, verify_tool  # noqa: I201
 
 log = logging.getLogger(__name__)
 

test/unit/test_verify.py

@@ -4,7 +4,7 @@ import tempfile
 
 import pytest
 
-from galaxy.tools.verify import (
+from galaxy.tool_util.verify import (
     files_contains,
     files_diff,
     files_re_match,