Merge pull request #2067 from jmchilton/shed_tests

Adjust testing directories so no python root is ever "tool_shed".

run_tests.sh

@@ -13,7 +13,7 @@ cat <<EOF
 '${0##*/} -sid ccc'                 for testing one section with sid 'ccc' ('ccc' is the string after 'section::')
 '${0##*/} -list'                    for listing all the tool ids
 '${0##*/} -api (test_path)'         for running all the test scripts in the ./test/api directory
-'${0##*/} -toolshed (test_path)'    for running all the test scripts in the ./test/tool_shed/functional directory
+'${0##*/} -toolshed (test_path)'    for running all the test scripts in the ./test/shed_functional/functional directory
 '${0##*/} -workflow test.xml'       for running a workflow test case as defined by supplied workflow xml test file (experimental)
 '${0##*/} -installed'               for running tests of Tool Shed installed tools
 '${0##*/} -framework'               for running through example tool tests testing framework features in test/functional/tools"
@@ -135,7 +135,7 @@ GALAXY_TEST_SHED_TOOL_CONF      Shed toolbox conf (defaults to
                                 installed to tools with -installed.
 TOOL_SHED_TEST_HOST             Host to use for shed server setup for testing.
 TOOL_SHED_TEST_PORT             Port to use for shed server setup for testing.
-TOOL_SHED_TEST_FILE_DIR         Defaults to test/tool_shed/test_data.
+TOOL_SHED_TEST_FILE_DIR         Defaults to test/shed_functional/test_data.
 TOOL_SHED_TEST_TMP_DIR          Defaults to random /tmp directory - place for
                                 tool shed test server files to be placed.
 TOOL_SHED_TEST_OMIT_GALAXY      Do not launch a Galaxy server for tool shed
@@ -247,13 +247,13 @@ do
           fi
           ;;
       -t|-toolshed|--toolshed)
-          test_script="./test/tool_shed/functional_tests.py"
+          test_script="./test/shed_functional/functional_tests.py"
           report_file="run_toolshed_tests.html"
           if [ $# -gt 1 ]; then
               toolshed_script=$2
               shift 2
           else
-              toolshed_script="./test/tool_shed/functional"
+              toolshed_script="./test/shed_functional/functional"
               shift 1
           fi
           ;;

test/base/driver_util.py

@@ -41,7 +41,7 @@ galaxy_root = os.path.abspath(os.path.join(os.path.dirname(__file__), os.path.pa
 DEFAULT_WEB_HOST = "localhost"
 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, "tool_shed", "test_data")
+TOOL_SHED_TEST_DATA = os.path.join(GALAXY_TEST_DIRECTORY, "shed_functional", "test_data")
 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")
 FRAMEWORK_SAMPLE_TOOLS_CONF = os.path.join(FRAMEWORK_TOOLS_DIR, "samples_tool_conf.xml")

test/shed_functional/functional/test_0000_basic_repository_features.py

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

test/shed_functional/functional/test_0010_repository_with_tool_dependencies.py

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

test/shed_functional/functional/test_0020_basic_repository_dependencies.py

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

test/shed_functional/functional/test_0030_repository_dependency_revisions.py

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

test/shed_functional/functional/test_0040_repository_circular_dependencies.py

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

test/shed_functional/functional/test_0050_circular_dependencies_4_levels.py

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

test/shed_functional/functional/test_0060_workflows.py

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

test/shed_functional/functional/test_0070_invalid_tool.py

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

test/shed_functional/functional/test_0080_advanced_circular_dependencies.py

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

test/shed_functional/functional/test_0090_tool_search.py

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

test/shed_functional/functional/test_0100_complex_repository_dependencies.py

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

test/shed_functional/functional/test_0110_invalid_simple_repository_dependencies.py

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

test/shed_functional/functional/test_0120_simple_repository_dependency_multiple_owners.py

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

test/shed_functional/functional/test_0130_datatype_converters.py

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

test/shed_functional/functional/test_0140_tool_help_images.py

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

test/shed_functional/functional/test_0150_prior_installation_required.py

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

test/shed_functional/functional/test_0160_circular_prior_installation_required.py

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

test/shed_functional/functional/test_0170_complex_prior_installation_required.py

@@ -1,6 +1,6 @@
 import os
 
-from tool_shed.base.twilltestcase import common, ShedTwillTestCase
+from shed_functional.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."

test/shed_functional/functional/test_0300_reset_all_metadata.py

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

test/shed_functional/functional/test_0310_hg_api_features.py

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

test/shed_functional/functional/test_0400_repository_component_reviews.py

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

test/shed_functional/functional/test_0410_repository_component_review_access_control.py

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

test/shed_functional/functional/test_0420_citable_urls_for_repositories.py

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

test/shed_functional/functional/test_0430_browse_utilities.py

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

test/shed_functional/functional/test_0440_deleting_dependency_definitions.py

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

test/shed_functional/functional/test_0450_skip_tool_tests.py

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

test/shed_functional/functional/test_0460_upload_to_repository.py

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

test/shed_functional/functional/test_0470_tool_dependency_repository_type.py

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

test/shed_functional/functional/test_0480_tool_dependency_xml_verification.py

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

test/shed_functional/functional/test_0490_export_import_repositories.py

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

test/shed_functional/functional/test_0500_export_repository_simple_dependency.py

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

test/shed_functional/functional/test_0510_export_import_repository_complex_dependencies.py

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

test/shed_functional/functional/test_0520_import_export_circular_dependencies.py

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

test/shed_functional/functional/test_0530_repository_admin_feature.py

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

test/shed_functional/functional/test_0540_get_all_metadata_from_api.py

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

test/shed_functional/functional/test_1000_install_basic_repository.py

@@ -1,4 +1,4 @@
-from tool_shed.base.twilltestcase import common, ShedTwillTestCase
+from shed_functional.base.twilltestcase import common, ShedTwillTestCase
 
 
 class BasicToolShedFeatures( ShedTwillTestCase ):

test/shed_functional/functional/test_1010_install_repository_with_tool_dependencies.py

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

test/shed_functional/functional/test_1020_install_repository_with_repository_dependencies.py

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

test/shed_functional/functional/test_1030_install_repository_with_dependency_revisions.py

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

test/shed_functional/functional/test_1040_install_repository_basic_circular_dependencies.py

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

test/shed_functional/functional/test_1050_circular_dependencies_4_levels.py

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

test/shed_functional/functional/test_1060_install_repository_with_workflow.py

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

test/shed_functional/functional/test_1070_invalid_tool.py

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

test/shed_functional/functional/test_1080_advanced_circular_dependency_installation.py

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

test/shed_functional/functional/test_1090_repository_dependency_handling.py

@@ -1,6 +1,6 @@
 import logging
 
-from tool_shed.base.twilltestcase import common, ShedTwillTestCase
+from shed_functional.base.twilltestcase import common, ShedTwillTestCase
 
 column_repository_name = 'column_maker_1085'
 column_repository_description = "Add column"

test/shed_functional/functional/test_1100_install_updated_repository_dependencies.py

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

test/shed_functional/functional/test_1110_install_tool_from_tool_search.py

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

test/shed_functional/functional/test_1120_install_repository_with_complex_dependencies.py

@@ -1,6 +1,6 @@
 import os
 
-from tool_shed.base.twilltestcase import common, ShedTwillTestCase
+from shed_functional.base.twilltestcase import common, ShedTwillTestCase
 
 bwa_base_repository_name = 'bwa_base_repository_0100'
 bwa_base_repository_description = "BWA Base"

test/shed_functional/functional/test_1130_install_repository_with_invalid_repository_dependency.py

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

test/shed_functional/functional/test_1140_simple_repository_dependency_multiple_owners.py

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

test/shed_functional/functional/test_1150_datatype_converters.py

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

test/shed_functional/functional/test_1160_tool_help_images.py

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

test/shed_functional/functional/test_1170_prior_installation_required.py

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

test/shed_functional/functional/test_1180_circular_prior_installation_required.py

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

test/shed_functional/functional/test_1190_complex_prior_installation_required.py

@@ -1,6 +1,6 @@
 import os
 
-from tool_shed.base.twilltestcase import common, ShedTwillTestCase
+from shed_functional.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."

test/shed_functional/functional/test_1200_uninstall_and_reinstall_basic_repository.py

@@ -1,4 +1,4 @@
-from tool_shed.base.twilltestcase import common, ShedTwillTestCase
+from shed_functional.base.twilltestcase import common, ShedTwillTestCase
 
 
 class UninstallingAndReinstallingRepositories( ShedTwillTestCase ):

test/shed_functional/functional/test_1210_uninstall_reinstall_repository_with_tool_dependencies.py

@@ -1,6 +1,6 @@
 import os
 
-from tool_shed.base.twilltestcase import common, ShedTwillTestCase
+from shed_functional.base.twilltestcase import common, ShedTwillTestCase
 
 
 class UninstallingAndReinstallingRepositories( ShedTwillTestCase ):

test/shed_functional/functional/test_1220_uninstall_reinstall_repository_with_repository_dependencies.py

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

test/shed_functional/functional/test_1230_uninstall_reinstall_repository_with_dependency_revisions.py

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

test/shed_functional/functional/test_1300_reset_all_metadata.py

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

test/shed_functional/functional/test_1400_review_migration_stages.py

@@ -1,4 +1,4 @@
-from tool_shed.base.twilltestcase import common, ShedTwillTestCase
+from shed_functional.base.twilltestcase import common, ShedTwillTestCase
 
 
 class TestToolMigrationStages( ShedTwillTestCase ):

test/shed_functional/functional/test_1410_update_manager.py

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

test/shed_functional/functional/test_1420_tool_dependency_environment_inheritance.py

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

test/shed_functional/functional/test_1430_repair_installed_repository.py

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

test/shed_functional/functional/test_1440_missing_env_sh_files.py

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

test/shed_functional/functional/test_1450_installing_datatypes_sniffers.py

@@ -1,4 +1,4 @@
-from tool_shed.base.twilltestcase import common, ShedTwillTestCase
+from shed_functional.base.twilltestcase import common, ShedTwillTestCase
 
 repository_name = 'proteomics_datatypes_1450'
 repository_description = "Proteomics datatypes"

test/shed_functional/functional/test_1460_data_managers.py

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

test/shed_functional/functional/test_1470_updating_installed_repositories.py

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