2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/4961f4e87947/
Changeset: 4961f4e87947
User: jgoecks
Date: 2013-12-23 17:54:46
Summary: Workflows API, run workflow: enable multiple parameter values to be set for a single step.
Affected #: 1 file
diff -r 31f4f354b66105d5c2bedc36d7fd80b37327b75e -r 4961f4e8794729f899a2901caf613201c7bb9f7a lib/galaxy/webapps/galaxy/api/workflows.py
--- a/lib/galaxy/webapps/galaxy/api/workflows.py
+++ b/lib/galaxy/webapps/galaxy/api/workflows.py
@@ -207,15 +207,18 @@
# Update step parameters as directed by payload's parameter mapping.
if step.tool_id in param_map:
- # Get parameter settings.
- change_param = param_map[step.tool_id]['param'];
- change_value = param_map[step.tool_id]['value'];
- step_id = param_map[step.tool_id].get('step_id', '')
+ param_dict = param_map[ step.tool_id ]
+ step_id = param_dict.get( 'step_id', '' )
+
+ # Backward compatibility: convert param/value dict to new 'name': 'value' format.
+ if 'param' in param_dict and 'value' in param_dict:
+ param_dict[ param_dict['param'] ] = param_dict['value']
# Update step if there's no step id (i.e. all steps with tool are
# updated) or update if step ids match.
if not step_id or ( step_id and int( step_id ) == step.id ):
- step.state.inputs[change_param] = change_value
+ for name, value in param_dict.items():
+ step.state.inputs[ name ] = value
if step.tool_errors:
trans.response.status = 400
https://bitbucket.org/galaxy/galaxy-central/commits/2c64d7fe6a78/
Changeset: 2c64d7fe6a78
User: jgoecks
Date: 2013-12-24 02:26:25
Summary: Automated merge.
Affected #: 2 files
diff -r 4961f4e8794729f899a2901caf613201c7bb9f7a -r 2c64d7fe6a7827b8d2b870c557ffc4d7acc24eca lib/tool_shed/util/container_util.py
--- a/lib/tool_shed/util/container_util.py
+++ b/lib/tool_shed/util/container_util.py
@@ -1368,11 +1368,11 @@
# 'tool_dependencies':
# [{'installation_directory': 'some path' 'type': 'package', 'name': 'MIRA', 'version': '4.0'}]
# }
- current_repository_successful_installation_dicts = successful_installation_dict.get( 'current_repository', [] )
+ # We won't display the current repository in this container. I fit is not displaying installation errors,
+ # then it must be a successful installation.
repository_dependency_successful_installation_dicts = successful_installation_dict.get( 'repository_dependencies', [] )
tool_dependency_successful_installation_dicts = successful_installation_dict.get( 'tool_dependencies', [] )
- if len( current_repository_successful_installation_dicts ) > 0 or \
- len( repository_dependency_successful_installation_dicts ) > 0 or \
+ if len( repository_dependency_successful_installation_dicts ) > 0 or \
len( tool_dependency_successful_installation_dicts ) > 0:
repository_installation_success_id = 0
folder_id += 1
diff -r 4961f4e8794729f899a2901caf613201c7bb9f7a -r 2c64d7fe6a7827b8d2b870c557ffc4d7acc24eca lib/tool_shed/util/tool_dependency_util.py
--- a/lib/tool_shed/util/tool_dependency_util.py
+++ b/lib/tool_shed/util/tool_dependency_util.py
@@ -56,7 +56,7 @@
if str( tool_dependency.status ) != str( status ):
debug_msg = 'Updating an existing record for version %s of tool dependency %s for revision %s of repository %s ' % \
( str( version ), str( name ), str( tool_shed_repository.changeset_revision ), str( tool_shed_repository.name ) )
- debug_msg += 'by updating the status from %s to %s.' % str( tool_dependency.status ), str( status )
+ debug_msg += 'by updating the status from %s to %s.' % ( str( tool_dependency.status ), str( status ) )
log.debug( debug_msg )
tool_dependency.status = status
context.add( tool_dependency )
@@ -65,7 +65,7 @@
# Create a new tool_dependency record for the tool_shed_repository.
debug_msg = 'Creating a new record for version %s of tool dependency %s for revision %s of repository %s. ' % \
( str( version ), str( name ), str( tool_shed_repository.changeset_revision ), str( tool_shed_repository.name ) )
- debug_msg += 'The statis is being set to %s.' % str( status )
+ debug_msg += 'The status is being set to %s.' % str( status )
log.debug( debug_msg )
tool_dependency = app.install_model.ToolDependency( tool_shed_repository.id, name, version, type, status )
context.add( tool_dependency )
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/ee86b02e26ab/
Changeset: ee86b02e26ab
User: greg
Date: 2013-12-23 13:15:57
Summary: Minor fixes for the tool shed's install and test framework.
Affected #: 2 files
diff -r 31f4f354b66105d5c2bedc36d7fd80b37327b75e -r ee86b02e26ab788122ec940f1f28c51208385cc2 lib/tool_shed/util/container_util.py
--- a/lib/tool_shed/util/container_util.py
+++ b/lib/tool_shed/util/container_util.py
@@ -1368,11 +1368,11 @@
# 'tool_dependencies':
# [{'installation_directory': 'some path' 'type': 'package', 'name': 'MIRA', 'version': '4.0'}]
# }
- current_repository_successful_installation_dicts = successful_installation_dict.get( 'current_repository', [] )
+ # We won't display the current repository in this container. I fit is not displaying installation errors,
+ # then it must be a successful installation.
repository_dependency_successful_installation_dicts = successful_installation_dict.get( 'repository_dependencies', [] )
tool_dependency_successful_installation_dicts = successful_installation_dict.get( 'tool_dependencies', [] )
- if len( current_repository_successful_installation_dicts ) > 0 or \
- len( repository_dependency_successful_installation_dicts ) > 0 or \
+ if len( repository_dependency_successful_installation_dicts ) > 0 or \
len( tool_dependency_successful_installation_dicts ) > 0:
repository_installation_success_id = 0
folder_id += 1
diff -r 31f4f354b66105d5c2bedc36d7fd80b37327b75e -r ee86b02e26ab788122ec940f1f28c51208385cc2 lib/tool_shed/util/tool_dependency_util.py
--- a/lib/tool_shed/util/tool_dependency_util.py
+++ b/lib/tool_shed/util/tool_dependency_util.py
@@ -56,7 +56,7 @@
if str( tool_dependency.status ) != str( status ):
debug_msg = 'Updating an existing record for version %s of tool dependency %s for revision %s of repository %s ' % \
( str( version ), str( name ), str( tool_shed_repository.changeset_revision ), str( tool_shed_repository.name ) )
- debug_msg += 'by updating the status from %s to %s.' % str( tool_dependency.status ), str( status )
+ debug_msg += 'by updating the status from %s to %s.' % ( str( tool_dependency.status ), str( status ) )
log.debug( debug_msg )
tool_dependency.status = status
context.add( tool_dependency )
@@ -65,7 +65,7 @@
# Create a new tool_dependency record for the tool_shed_repository.
debug_msg = 'Creating a new record for version %s of tool dependency %s for revision %s of repository %s. ' % \
( str( version ), str( name ), str( tool_shed_repository.changeset_revision ), str( tool_shed_repository.name ) )
- debug_msg += 'The statis is being set to %s.' % str( status )
+ debug_msg += 'The status is being set to %s.' % str( status )
log.debug( debug_msg )
tool_dependency = app.install_model.ToolDependency( tool_shed_repository.id, name, version, type, status )
context.add( tool_dependency )
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/31f4f354b661/
Changeset: 31f4f354b661
User: jgoecks
Date: 2013-12-23 01:24:37
Summary: Workflows API, running workflows: (a) improve code documentation and (b) add option to specify step_id when setting parameters so that parameters are set for a single step rather than all steps with a given tool id.
Affected #: 1 file
diff -r 9264df2bd5f015e7d8c011683b4f89e6beeacb4a -r 31f4f354b66105d5c2bedc36d7fd80b37327b75e lib/galaxy/webapps/galaxy/api/workflows.py
--- a/lib/galaxy/webapps/galaxy/api/workflows.py
+++ b/lib/galaxy/webapps/galaxy/api/workflows.py
@@ -104,15 +104,15 @@
However, we will import them if installed_repository_file is specified
"""
- # ------------------------------------------------------------------------------- #
- ### RPARK: dictionary containing which workflows to change and edit ###
- param_map = {};
- if (payload.has_key('parameters') ):
- param_map = payload['parameters'];
- # ------------------------------------------------------------------------------- #
+ # Pull parameters out of payload.
+ workflow_id = payload['workflow_id']
+ param_map = payload.get('parameters', {})
+ ds_map = payload['ds_map']
+ add_to_history = 'no_add_to_history' not in payload
+ history_param = payload['history']
-
- if 'workflow_id' not in payload:
+ # Get/create workflow.
+ if not workflow_id:
# create new
if 'installed_repository_file' in payload:
workflow_controller = trans.webapp.controllers[ 'workflow' ]
@@ -125,26 +125,31 @@
if 'installed_repository_file' in payload:
trans.response.status = 403
return "installed_repository_file may not be specified with workflow_id"
+
+ # Get workflow + accessibility check.
stored_workflow = trans.sa_session.query(self.app.model.StoredWorkflow).get(
- trans.security.decode_id(payload['workflow_id']))
+ trans.security.decode_id(workflow_id))
if stored_workflow.user != trans.user and not trans.user_is_admin():
if trans.sa_session.query(trans.app.model.StoredWorkflowUserShareAssociation).filter_by(user=trans.user, stored_workflow=stored_workflow).count() == 0:
trans.response.status = 400
return("Workflow is not owned by or shared with current user")
workflow = stored_workflow.latest_workflow
- if payload['history'].startswith('hist_id='):
+
+ # Get target history.
+ if history_param.startswith('hist_id='):
#Passing an existing history to use.
history = trans.sa_session.query(self.app.model.History).get(
- trans.security.decode_id(payload['history'][8:]))
+ trans.security.decode_id(history_param[8:]))
if history.user != trans.user and not trans.user_is_admin():
trans.response.status = 400
return "Invalid History specified."
else:
- history = self.app.model.History(name=payload['history'], user=trans.user)
+ # Send workflow outputs to new history.
+ history = self.app.model.History(name=history_param, user=trans.user)
trans.sa_session.add(history)
trans.sa_session.flush()
- ds_map = payload['ds_map']
- add_to_history = 'no_add_to_history' not in payload
+
+ # Set workflow inputs.
for k in ds_map:
try:
if ds_map[k]['src'] == 'ldda':
@@ -172,6 +177,8 @@
except AssertionError:
trans.response.status = 400
return "Invalid Dataset '%s' Specified" % ds_map[k]['id']
+
+ # Sanity checks.
if not workflow:
trans.response.status = 400
return "Workflow not found."
@@ -184,6 +191,7 @@
if workflow.has_errors:
trans.response.status = 400
return "Workflow cannot be run because of validation errors in some steps"
+
# Build the state for each step
rval = {}
for step in workflow.steps:
@@ -197,16 +205,18 @@
step.module.add_dummy_datasets( connections=step.input_connections )
step.state = step.module.state
- ####################################################
- ####################################################
- # RPARK: IF TOOL_NAME IN PARAMETER MAP #
+ # Update step parameters as directed by payload's parameter mapping.
if step.tool_id in param_map:
+ # Get parameter settings.
change_param = param_map[step.tool_id]['param'];
change_value = param_map[step.tool_id]['value'];
- step.state.inputs[change_param] = change_value;
- ####################################################
- ####################################################
+ step_id = param_map[step.tool_id].get('step_id', '')
+ # Update step if there's no step id (i.e. all steps with tool are
+ # updated) or update if step ids match.
+ if not step_id or ( step_id and int( step_id ) == step.id ):
+ step.state.inputs[change_param] = change_value
+
if step.tool_errors:
trans.response.status = 400
return "Workflow cannot be run because of validation errors in some steps: %s" % step_errors
@@ -221,6 +231,7 @@
step.module = module_factory.from_workflow_step( trans, step )
step.state = step.module.get_runtime_state()
step.input_connections_by_name = dict( ( conn.input_name, conn ) for conn in step.input_connections )
+
# Run each step, connecting outputs to inputs
workflow_invocation = self.app.model.WorkflowInvocation()
workflow_invocation.workflow = workflow
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/9264df2bd5f0/
Changeset: 9264df2bd5f0
User: greg
Date: 2013-12-22 14:13:19
Summary: Improve logging when creating or updating tool dependency records installed into Galaxy.
Affected #: 2 files
diff -r 37ddaa4b6a112c776b5ac011464b680c9cb50545 -r 9264df2bd5f015e7d8c011683b4f89e6beeacb4a lib/tool_shed/galaxy_install/tool_dependencies/install_util.py
--- a/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py
+++ b/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py
@@ -88,23 +88,29 @@
# the path defined by required_tool_dependency_env_file_path. It doesn't matter if the required env.sh
# file currently exists..
required_tool_dependency_env_file_path = \
- tool_dependency_util.get_required_repository_package_env_sh_path( app, package_name, package_version, required_repository )
+ tool_dependency_util.get_required_repository_package_env_sh_path( app,
+ package_name,
+ package_version,
+ required_repository )
env_file_builder = fabric_util.EnvFileBuilder( tool_dependency.installation_directory( app ) )
env_file_builder.append_line( action="source", value=required_tool_dependency_env_file_path )
return_code = env_file_builder.return_code
if return_code:
- error_message = 'Error defining env.sh file for package %s, return_code: %s' % ( str( package_name ), str( return_code ) )
- tool_dependency = tool_dependency_util.handle_tool_dependency_installation_error( app,
- tool_dependency,
- error_message,
- remove_installation_path=False )
+ error_message = 'Error defining env.sh file for package %s, return_code: %s' % \
+ ( str( package_name ), str( return_code ) )
+ tool_dependency = \
+ tool_dependency_util.handle_tool_dependency_installation_error( app,
+ tool_dependency,
+ error_message,
+ remove_installation_path=False )
elif required_tool_dependency is not None and required_tool_dependency.in_error_state:
error_message = "This tool dependency's required tool dependency %s version %s has status %s." % \
( str( required_tool_dependency.name ), str( required_tool_dependency.version ), str( required_tool_dependency.status ) )
- tool_dependency = tool_dependency_util.handle_tool_dependency_installation_error( app,
- tool_dependency,
- error_message,
- remove_installation_path=False )
+ tool_dependency = \
+ tool_dependency_util.handle_tool_dependency_installation_error( app,
+ tool_dependency,
+ error_message,
+ remove_installation_path=False )
else:
tool_dependency = \
tool_dependency_util.set_tool_dependency_attributes( app,
diff -r 37ddaa4b6a112c776b5ac011464b680c9cb50545 -r 9264df2bd5f015e7d8c011683b4f89e6beeacb4a lib/tool_shed/util/tool_dependency_util.py
--- a/lib/tool_shed/util/tool_dependency_util.py
+++ b/lib/tool_shed/util/tool_dependency_util.py
@@ -51,18 +51,25 @@
else:
tool_dependency = get_tool_dependency_by_name_type_repository( app, tool_shed_repository, name, type )
if tool_dependency:
- log.debug( 'Updating an existing record for tool dependency %s version %s for tool shed repository %s with changeset revision %s.' %
- ( str( name ), str( version ), str( tool_shed_repository.name ), str( tool_shed_repository.changeset_revision ) ) )
# In some cases we should not override the current status of an existing tool_dependency, so do so only if set_status is True.
if set_status:
+ if str( tool_dependency.status ) != str( status ):
+ debug_msg = 'Updating an existing record for version %s of tool dependency %s for revision %s of repository %s ' % \
+ ( str( version ), str( name ), str( tool_shed_repository.changeset_revision ), str( tool_shed_repository.name ) )
+ debug_msg += 'by updating the status from %s to %s.' % str( tool_dependency.status ), str( status )
+ log.debug( debug_msg )
tool_dependency.status = status
+ context.add( tool_dependency )
+ context.flush()
else:
# Create a new tool_dependency record for the tool_shed_repository.
- log.debug( 'Creating a new record for tool dependency %s version %s for tool shed repository %s with changeset revision %s.' %
- ( str( name ), str( version ), str( tool_shed_repository.name ), str( tool_shed_repository.changeset_revision ) ) )
+ debug_msg = 'Creating a new record for version %s of tool dependency %s for revision %s of repository %s. ' % \
+ ( str( version ), str( name ), str( tool_shed_repository.changeset_revision ), str( tool_shed_repository.name ) )
+ debug_msg += 'The statis is being set to %s.' % str( status )
+ log.debug( debug_msg )
tool_dependency = app.install_model.ToolDependency( tool_shed_repository.id, name, version, type, status )
- context.add( tool_dependency )
- context.flush()
+ context.add( tool_dependency )
+ context.flush()
return tool_dependency
def create_tool_dependency_objects( app, tool_shed_repository, relative_install_dir, set_status=True ):
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/37ddaa4b6a11/
Changeset: 37ddaa4b6a11
User: greg
Date: 2013-12-22 05:01:55
Summary: Log the location of the exclude list file for the tool shed's install and test framework.
Affected #: 2 files
diff -r 12cbce6f1a20d8eecabc4ef50ca4d44c89eea505 -r 37ddaa4b6a112c776b5ac011464b680c9cb50545 test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py
--- a/test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py
+++ b/test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py
@@ -64,7 +64,7 @@
# the database, new repositories, etc.
galaxy_test_tmp_dir = os.path.join( test_home_directory, 'tmp' )
# File containing information about problematic repositories to exclude from test runs.
-exclude_list_file = os.path.join( test_home_directory, 'exclude.xml' )
+exclude_list_file = os.path.abspath( os.path.join( test_home_directory, 'exclude.xml' ) )
default_galaxy_locales = 'en'
default_galaxy_test_file_dir = "test-data"
os.environ[ 'GALAXY_INSTALL_TEST_TMP_DIR' ] = galaxy_test_tmp_dir
@@ -145,6 +145,7 @@
if error_message:
return None, error_message
# Handle repositories not to be tested.
+ log.debug( 'The exclude list file is defined as %s' % str( exclude_list_file ) )
if os.path.exists( exclude_list_file ):
log.debug( 'Loading the list of repositories excluded from testing from the file %s...' % str( exclude_list_file ) )
# The following exclude_list will look something like this:
@@ -153,6 +154,7 @@
# ( name, owner, changeset_revision if changeset_revision else None )]}]
exclude_list_dicts = install_and_test_base_util.parse_exclude_list( exclude_list_file )
else:
+ log.debug( 'The exclude list file %s does not exist, so no repositories will be excluded from testing.' % str( exclude_list_file ) )
exclude_list_dicts = []
# Generate a test method that will use Twill to install each repository into the embedded Galaxy application that was
# started up, installing repository and tool dependencies. Upon successful installation, generate a test case for each
diff -r 12cbce6f1a20d8eecabc4ef50ca4d44c89eea505 -r 37ddaa4b6a112c776b5ac011464b680c9cb50545 test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py
--- a/test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py
+++ b/test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py
@@ -62,7 +62,7 @@
# the database, new repositories, etc.
galaxy_test_tmp_dir = os.path.join( test_home_directory, 'tmp' )
# File containing information about problematic repositories to exclude from test runs.
-exclude_list_file = os.path.join( test_home_directory, 'exclude.xml' )
+exclude_list_file = os.path.abspath( os.path.join( test_home_directory, 'exclude.xml' ) )
default_galaxy_locales = 'en'
default_galaxy_test_file_dir = "test-data"
os.environ[ 'GALAXY_INSTALL_TEST_TMP_DIR' ] = galaxy_test_tmp_dir
@@ -83,6 +83,7 @@
install_and_test_base_util.get_repositories_to_install( install_and_test_base_util.galaxy_tool_shed_url, test_framework )
if error_message:
return None, error_message
+ log.debug( 'The exclude list file is defined as %s' % str( exclude_list_file ) )
if os.path.exists( exclude_list_file ):
log.debug( 'Loading the list of repositories excluded from testing from the file %s...' % str( exclude_list_file ) )
# The following exclude_list will look something like this:
@@ -91,6 +92,7 @@
# ( name, owner, changeset_revision if changeset_revision else None )]}]
exclude_list_dicts = install_and_test_base_util.parse_exclude_list( exclude_list_file )
else:
+ log.debug( 'The exclude list file %s does not exist, so no repositories will be excluded from testing.' % str( exclude_list_file ) )
exclude_list_dicts = []
# Generate a test method that will use Twill to install each repository into the embedded Galaxy application that was
# started up, installing repository and tool dependencies. Upon successful installation, generate a test case for each
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/12cbce6f1a20/
Changeset: 12cbce6f1a20
User: greg
Date: 2013-12-22 02:39:36
Summary: Fix for my last commit.
Affected #: 1 file
diff -r 23d547cfc2d1007e7c82e8f018d087c18642dc49 -r 12cbce6f1a20d8eecabc4ef50ca4d44c89eea505 test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py
--- a/test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py
+++ b/test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py
@@ -197,7 +197,7 @@
( changeset_revision, name, owner ) )
else:
# See if the repository was installed in a previous test.
- repository = install_and_test_base_utilget_repository( name, owner, changeset_revision )
+ repository = install_and_test_base_util.get_repository( name, owner, changeset_revision )
if repository is None:
# The repository was not previously installed, so install it now.
tool_test_results_dict = install_and_test_base_util.initialize_tool_tests_results_dict( app, tool_test_results_dict )
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/23d547cfc2d1/
Changeset: 23d547cfc2d1
User: greg
Date: 2013-12-22 02:31:18
Summary: Fix prep scripts for the tool shed's install and test framework.
Affected #: 2 files
diff -r 0f70f0b461678cd8224861857055f3eaf7646b05 -r 23d547cfc2d1007e7c82e8f018d087c18642dc49 test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py
--- a/test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py
+++ b/test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py
@@ -197,7 +197,7 @@
( changeset_revision, name, owner ) )
else:
# See if the repository was installed in a previous test.
- repository = get_repository( name, owner, changeset_revision )
+ repository = install_and_test_base_utilget_repository( name, owner, changeset_revision )
if repository is None:
# The repository was not previously installed, so install it now.
tool_test_results_dict = install_and_test_base_util.initialize_tool_tests_results_dict( app, tool_test_results_dict )
diff -r 0f70f0b461678cd8224861857055f3eaf7646b05 -r 23d547cfc2d1007e7c82e8f018d087c18642dc49 test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py
--- a/test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py
+++ b/test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py
@@ -135,7 +135,7 @@
( changeset_revision, name, owner ) )
else:
# See if the repository was installed in a previous test.
- repository = get_repository( name, owner, changeset_revision )
+ repository = install_and_test_base_util.get_repository( name, owner, changeset_revision )
if repository is None:
# The repository was not previously installed, so install it now.
tool_test_results_dict = install_and_test_base_util.initialize_tool_tests_results_dict( app, tool_test_results_dict )
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.