From f5d1f77a4f3a4c816e7cb8f1ddc5758a88c3e71b Mon Sep 17 00:00:00 2001 From: John Chilton Date: Mon, 6 Oct 2014 20:56:58 -0400 Subject: [PATCH] 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. --- lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py | 1 + scripts/functional_tests.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py b/lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py index 3ebd24c1d51..ea417352deb 100644 --- a/lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py +++ b/lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py @@ -17,6 +17,7 @@ from galaxy.util.json import dumps eggs.require('PyYAML') eggs.require('boto') +eggs.require('simplejson') eggs.require('bioblend') from boto.exception import EC2ResponseError diff --git a/scripts/functional_tests.py b/scripts/functional_tests.py index 96d4421b28a..2652e14b9b4 100644 --- a/scripts/functional_tests.py +++ b/scripts/functional_tests.py @@ -16,6 +16,7 @@ sys.path = new_path 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 @@ def main(): 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