3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/c18dc778dabe/ Changeset: c18dc778dabe Branch: next-stable User: jmchilton Date: 2014-09-23 17:38:25+00:00 Summary: Fix run_tests.sh --with_framework_test_tools for 9a05d1e. Now appends test tools to sample tools instead of to default tools Galaxy would other wise load (config/tool_conf.xml or tool_conf.xml if these exist instead of sample) - so this is different behavior but I am unsure if it is worse. --with_framework_test_tools was added for API tests and these should probably target the distribution and not random tools someone might have configured so perhaps this new behavior is superior. Affected #: 1 file diff -r 6e02e4f954d254787ce9caaf961b0a271bc7bcb6 -r c18dc778dabe708961554170f1af7dd50bd81be0 scripts/functional_tests.py --- a/scripts/functional_tests.py +++ b/scripts/functional_tests.py @@ -226,9 +226,7 @@ # Use tool_conf.xml toolbox. tool_conf = None if __check_arg( '-with_framework_test_tools' ): - # Some of these tools will not work without swapping - # default interactor to point to test. - tool_conf = "%s,%s" % ( tool_conf, os.path.join( framework_tool_dir, 'samples_tool_conf.xml' ) ) + tool_conf = "%s,%s" % ( 'config/tool_conf.xml.sample', os.path.join( framework_tool_dir, 'samples_tool_conf.xml' ) ) test_dir = default_galaxy_test_file_dir tool_config_file = os.environ.get( 'GALAXY_TEST_TOOL_CONF', tool_conf ) galaxy_test_file_dir = os.environ.get( 'GALAXY_TEST_FILE_DIR', test_dir ) https://bitbucket.org/galaxy/galaxy-central/commits/803755d0cd20/ Changeset: 803755d0cd20 Branch: next-stable User: jmchilton Date: 2014-09-23 17:38:25+00:00 Summary: Improved configuration error messages. Affected #: 1 file diff -r c18dc778dabe708961554170f1af7dd50bd81be0 -r 803755d0cd2098165c819c44b81f7f2591f9c69e lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -518,9 +518,9 @@ tool_configs.append( self.migrated_tools_config ) for path in tool_configs: if not os.path.exists( path ): - raise ConfigurationError("File not found: %s" % path ) + raise ConfigurationError("Tool config file not found: %s" % path ) if not os.path.isfile( self.datatypes_config ): - raise ConfigurationError("File not found: %s" % self.datatypes_config ) + raise ConfigurationError("Datatypes config file not found: %s" % self.datatypes_config ) # Check for deprecated options. for key in self.config_dict.keys(): if key in self.deprecated_options: https://bitbucket.org/galaxy/galaxy-central/commits/f69e8502c765/ Changeset: f69e8502c765 User: jmchilton Date: 2014-09-23 17:39:09+00:00 Summary: Merge latest next-stable. Affected #: 2 files diff -r 05abe03187a13527b8da8d0421822090a96969a7 -r f69e8502c76500d615d8d98a64ae904b1d328284 lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -518,9 +518,9 @@ tool_configs.append( self.migrated_tools_config ) for path in tool_configs: if not os.path.exists( path ): - raise ConfigurationError("File not found: %s" % path ) + raise ConfigurationError("Tool config file not found: %s" % path ) if not os.path.isfile( self.datatypes_config ): - raise ConfigurationError("File not found: %s" % self.datatypes_config ) + raise ConfigurationError("Datatypes config file not found: %s" % self.datatypes_config ) # Check for deprecated options. for key in self.config_dict.keys(): if key in self.deprecated_options: diff -r 05abe03187a13527b8da8d0421822090a96969a7 -r f69e8502c76500d615d8d98a64ae904b1d328284 scripts/functional_tests.py --- a/scripts/functional_tests.py +++ b/scripts/functional_tests.py @@ -226,9 +226,7 @@ # Use tool_conf.xml toolbox. tool_conf = None if __check_arg( '-with_framework_test_tools' ): - # Some of these tools will not work without swapping - # default interactor to point to test. - tool_conf = "%s,%s" % ( tool_conf, os.path.join( framework_tool_dir, 'samples_tool_conf.xml' ) ) + tool_conf = "%s,%s" % ( 'config/tool_conf.xml.sample', os.path.join( framework_tool_dir, 'samples_tool_conf.xml' ) ) test_dir = default_galaxy_test_file_dir tool_config_file = os.environ.get( 'GALAXY_TEST_TOOL_CONF', tool_conf ) galaxy_test_file_dir = os.environ.get( 'GALAXY_TEST_FILE_DIR', test_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.