1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/27a834173645/ Changeset: 27a834173645 User: natefoo Date: 2013-06-30 16:04:58 Summary: GCC2013 Advanced Tool and Data Source Configuration workshop: "The test framework uses tool_conf.xml.sample for reasons unknown and lost to time."

Use tool_conf.xml for running functional tests, rather than tool_conf.xml.sample. Affected #: 3 files

diff -r 9c4b7f8d2f980ff69a0e7947c9360dd7154c65eb -r 27a8341736452288e7324559ff74df38abaa3931 buildbot_setup.sh --- a/buildbot_setup.sh +++ b/buildbot_setup.sh @@ -65,6 +65,7 @@ "

SAMPLES=" +tool_conf.xml.sample datatypes_conf.xml.sample universe_wsgi.ini.sample tool_data_table_conf.xml.sample

diff -r 9c4b7f8d2f980ff69a0e7947c9360dd7154c65eb -r 27a8341736452288e7324559ff74df38abaa3931 run_functional_tests.sh --- a/run_functional_tests.sh +++ b/run_functional_tests.sh @@ -51,4 +51,3 @@ fi

echo "'run_functional_tests.sh help' for help" -echo "Note: galaxy test framework uses tool_conf.xml.sample, not tool_conf.xml"

diff -r 9c4b7f8d2f980ff69a0e7947c9360dd7154c65eb -r 27a8341736452288e7324559ff74df38abaa3931 scripts/functional_tests.py --- a/scripts/functional_tests.py +++ b/scripts/functional_tests.py @@ -129,7 +129,7 @@ # Exclude all files except test_toolbox.py. ignore_files = ( re.compile( r'^test_[adghlmsu]*' ), re.compile( r'^test_ta*' ) ) else: - tool_config_file = os.environ.get( 'GALAXY_TEST_TOOL_CONF', 'tool_conf.xml.sample' ) + tool_config_file = os.environ.get( 'GALAXY_TEST_TOOL_CONF', 'tool_conf.xml' ) galaxy_test_file_dir = os.environ.get( 'GALAXY_TEST_FILE_DIR', default_galaxy_test_file_dir ) if not os.path.isabs( galaxy_test_file_dir ): galaxy_test_file_dir = os.path.join( os.getcwd(), galaxy_test_file_dir )

Repository URL: https://bitbucket.org/galaxy/galaxy-central/

--

This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.