opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 02:04:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add more informative logging for repository installation errors when installing and testing repositories. Limit uninstallation of tool dependencies in an error state to those that are displayed on the "Uninstall tool dependencies" page.

Browse Source
This commit is contained in:
Dave Bouvier
2013-11-12 09:25:32 -05:00
parent 6d376aa4ed
commit 3741102e39
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/install_and_test_tool_shed_repositories/base/twilltestcase.py
+4 -2
View File
@@ -163,6 +163,8 @@ class InstallTestRepository( TwillTestCase ):
url = '/admin_toolshed/uninstall_tool_dependencies?repository_id=%s&inst_td_ids=%s&operation=uninstall' % \
( encoded_repository_id, tool_dependency_ids )
self.visit_url( url )
tc.fv( 'uninstall_tool_dependencies', 'tool_dependency_ids', tool_dependency_ids )
tc.submit( 'uninstall_tool_dependencies_button' )
html = self.last_page()
if 'uninstall_tool_dependencies' in html:
tc.fv( 'uninstall_tool_dependencies', 'tool_dependency_ids', tool_dependency_ids )
tc.submit( 'uninstall_tool_dependencies_button' )
test/install_and_test_tool_shed_repositories/functional_tests.py
+5 -1
View File
@@ -1037,16 +1037,20 @@ def main():
# If a tool dependency fails to install correctly, this should be considered an installation error,
# and functional tests should be skipped, since the tool dependency needs to be correctly installed
# for the test to be considered reliable.
log.error( 'One or more tool dependencies of this repository are marked as missing.' )
log.error( 'One or more dependencies of this repository are marked as missing.' )
log.error( 'Updating repository and skipping functional tests.' )
# In keeping with the standard display layout, add the error message to the dict for each tool individually.
for dependency in failed_tool_dependencies:
log.error( 'Missing tool dependency %s of type %s version %s: %s' % \
( str( dependency.name ), str( dependency.type ), str( dependency.version ), str( dependency.error_message ) ) )
test_result = dict( type=dependency.type,
name=dependency.name,
version=dependency.version,
error_message=dependency.error_message )
repository_status[ 'installation_errors' ][ 'tool_dependencies' ].append( test_result )
for dependency in repository.repository_dependencies_with_installation_errors:
log.error( 'Missing repository dependency %s changeset revision %s owned by %s: %s' % \
( str( dependency.name ), str( dependency.changeset_revision ), str( dependency.owner ), str( dependency.error_message ) ) )
test_result = dict( tool_shed=dependency.tool_shed,
name=dependency.name,
owner=dependency.owner,