Rename samples_tool_conf to sample_tool_conf to match datatypes/data_manager naming convention

doc/source/dev/writing_tests.md

@@ -196,7 +196,7 @@ or simply "Framework Tests".
 Adding a tool test is as simple as finding a related tool in the sample
 tools (``test/functional/tools``) and adding a test block to that file
 or adding a new tool to this directory and referencing it in the
-sample tool configuration XML (``test/functional/tools/samples_tool_conf.xml``).
+sample tool configuration XML (``test/functional/tools/sample_tool_conf.xml``).
 
 General information on writing Galaxy Tool Tests can be found in Planemo's
 documentation - for instance in the [Test-Driven Development](https://planemo.readthedocs.io/en/latest/writing_advanced.html#test-driven-development)

lib/galaxy_test/driver/driver_util.py

@@ -61,7 +61,7 @@ TOOL_SHED_TEST_DATA = os.path.join(galaxy_root, "lib", "tool_shed", "test", "tes
 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")
-FRAMEWORK_SAMPLE_TOOLS_CONF = os.path.join(FRAMEWORK_TOOLS_DIR, "samples_tool_conf.xml")
+FRAMEWORK_SAMPLE_TOOLS_CONF = os.path.join(FRAMEWORK_TOOLS_DIR, "sample_tool_conf.xml")
 FRAMEWORK_DATATYPES_CONF = os.path.join(FRAMEWORK_TOOLS_DIR, "sample_datatypes_conf.xml")
 MIGRATED_TOOL_PANEL_CONFIG = "config/migrated_tools_conf.xml"
 INSTALLED_TOOL_PANEL_CONFIGS = [os.environ.get("GALAXY_TEST_SHED_TOOL_CONF", "config/shed_tool_conf.xml")]

run.sh

@@ -36,7 +36,7 @@ setup_python
 
 if [ ! -z "$GALAXY_RUN_WITH_TEST_TOOLS" ];
 then
-    export GALAXY_CONFIG_OVERRIDE_TOOL_CONFIG_FILE="$(pwd)/test/functional/tools/samples_tool_conf.xml"
+    export GALAXY_CONFIG_OVERRIDE_TOOL_CONFIG_FILE="$(pwd)/test/functional/tools/sample_tool_conf.xml"
     export GALAXY_CONFIG_ENABLE_BETA_WORKFLOW_MODULES="true"
     export GALAXY_CONFIG_OVERRIDE_ENABLE_BETA_TOOL_FORMATS="true"
     export GALAXY_CONFIG_INTERACTIVETOOLS_ENABLE="true"

run_tests.sh

@@ -314,7 +314,7 @@ do
       -a|-api|--api)
           GALAXY_TEST_USE_HIERARCHICAL_OBJECT_STORE="True"  # Run these tests with a non-trivial object store.
           export GALAXY_TEST_USE_HIERARCHICAL_OBJECT_STORE
-          GALAXY_TEST_TOOL_CONF="lib/galaxy/config/sample/tool_conf.xml.sample,test/functional/tools/samples_tool_conf.xml"
+          GALAXY_TEST_TOOL_CONF="lib/galaxy/config/sample/tool_conf.xml.sample,test/functional/tools/sample_tool_conf.xml"
           marker="not cwl_conformance"
           report_file="./run_api_tests.html"
           if [ $# -gt 1 ]; then
@@ -328,7 +328,7 @@ do
       -cwl|--cwl)
           GALAXY_TEST_USE_HIERARCHICAL_OBJECT_STORE="True"  # Run these tests with a non-trivial object store.
           export GALAXY_TEST_USE_HIERARCHICAL_OBJECT_STORE
-          GALAXY_TEST_TOOL_CONF="lib/galaxy/config/sample/tool_conf.xml.sample,test/functional/tools/samples_tool_conf.xml"
+          GALAXY_TEST_TOOL_CONF="lib/galaxy/config/sample/tool_conf.xml.sample,test/functional/tools/sample_tool_conf.xml"
           marker="cwl_conformance"
           report_file="./run_cwl_tests.html"
           generate_cwl_conformance_tests=1
@@ -341,7 +341,7 @@ do
           fi
           ;;
       -selenium|--selenium)
-          GALAXY_TEST_TOOL_CONF="lib/galaxy/config/sample/tool_conf.xml.sample,test/functional/tools/samples_tool_conf.xml"
+          GALAXY_TEST_TOOL_CONF="lib/galaxy/config/sample/tool_conf.xml.sample,test/functional/tools/sample_tool_conf.xml"
           report_file="./run_selenium_tests.html"
           skip_client_build=""
           if [ $# -gt 1 ]; then
@@ -385,7 +385,7 @@ do
           shift 2
           ;;
       -f|-framework|--framework)
-          GALAXY_TEST_TOOL_CONF="test/functional/tools/samples_tool_conf.xml"
+          GALAXY_TEST_TOOL_CONF="test/functional/tools/sample_tool_conf.xml"
           marker="tool"
           report_file="run_framework_tests.html"
           framework_test=1;
@@ -478,7 +478,7 @@ do
           fi
           ;;
       -i|-integration|--integration)
-          GALAXY_TEST_TOOL_CONF="lib/galaxy/config/sample/tool_conf.xml.sample,test/functional/tools/samples_tool_conf.xml"
+          GALAXY_TEST_TOOL_CONF="lib/galaxy/config/sample/tool_conf.xml.sample,test/functional/tools/sample_tool_conf.xml"
           report_file="./run_integration_tests.html"
           if [ $# -gt 1 ]; then
               integration_extra=$2

test/functional/tools/README.txt

@@ -12,4 +12,4 @@ to ensure these tools get loaded during the testing process.
 Finally, to play around with these tools interactively - simply
 replace the 'galaxy.ini' option 'tool_config_file' with:
 
-tool_config_file = test/functional/tools/samples_tool_conf.xml
+tool_config_file = test/functional/tools/sample_tool_conf.xml