1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/d7dd1f92d5b8/ Changeset: d7dd1f92d5b8 User: jmchilton Date: 2014-10-07 00:56:58+00:00 Summary: Make functional tests to respect GALAXY_CONFIG_ environment variables. Functional tests don't work without the tweak to imports in cloudlaunch - not sure if that has always been a problem and I am just running the tests in a different Galaxy instance or if the earlier import of util caused the problem. Regardless I guess we shoud update to a version of bioblend that doesn't require simplejson. Affected #: 2 files diff -r 594b48fe90b7b17ed22f5c597837022d8204db47 -r d7dd1f92d5b8e35ed9530fc5f0494e160ff8c4da lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py --- a/lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py +++ b/lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py @@ -17,6 +17,7 @@ eggs.require('PyYAML') eggs.require('boto') +eggs.require('simplejson') eggs.require('bioblend') from boto.exception import EC2ResponseError diff -r 594b48fe90b7b17ed22f5c597837022d8204db47 -r d7dd1f92d5b8e35ed9530fc5f0494e160ff8c4da scripts/functional_tests.py --- a/scripts/functional_tests.py +++ b/scripts/functional_tests.py @@ -16,6 +16,7 @@ from base.tool_shed_util import parse_tool_panel_config from galaxy import eggs +from galaxy.util.properties import load_app_properties eggs.require( "nose" ) eggs.require( "NoseHTML" ) @@ -401,6 +402,9 @@ kwargs[ 'global_conf' ] = get_webapp_global_conf() kwargs[ 'global_conf' ][ '__file__' ] = galaxy_config_file kwargs[ 'config_file' ] = galaxy_config_file + kwargs = load_app_properties( + kwds=kwargs + ) # Build the Universe Application app = UniverseApplication( **kwargs ) database_contexts.galaxy_context = app.model.context 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.