1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/aa8204e99326/ Changeset: aa8204e99326 User: Dave Bouvier Date: 2013-11-19 15:51:30 Summary: Log more information about tool dependency and repository installation status when installing and testing. Affected #: 2 files diff -r 73b57b7e1b73dbbf8b786d5dc749b67d635f8338 -r aa8204e99326288ea07e1af26c7d3ffd11f0aff1 test/install_and_test_tool_shed_repositories/base/twilltestcase.py --- a/test/install_and_test_tool_shed_repositories/base/twilltestcase.py +++ b/test/install_and_test_tool_shed_repositories/base/twilltestcase.py @@ -107,6 +107,7 @@ self.submit_form( 1, 'select_tool_panel_section_button', **kwd ) self.check_for_strings( post_submit_strings_displayed, strings_not_displayed ) repository_ids = self.initiate_installation_process( new_tool_panel_section=new_tool_panel_section ) + log.debug( 'Waiting for the installation of repository IDs: %s' % str( repository_ids ) ) self.wait_for_repository_installation( repository_ids ) def visit_url( self, url, allowed_codes=[ 200 ] ): @@ -124,10 +125,14 @@ if repository_ids: for repository_id in repository_ids: galaxy_repository = test_db_util.get_repository( self.security.decode_id( repository_id ) ) + log.debug( 'Repository %s with ID %s has initial state %s.' % ( str( galaxy_repository.name ), str( repository_id ), str( galaxy_repository.status ) ) ) timeout_counter = 0 while galaxy_repository.status not in final_states: test_db_util.refresh( galaxy_repository ) + log.debug( 'Repository %s with ID %s is in state %s, continuing to wait.' % ( str( galaxy_repository.name ), str( repository_id ), str( galaxy_repository.status ) ) ) timeout_counter = timeout_counter + 1 + if timeout_counter % 10 == 0: + log.debug( 'Waited %d seconds for repository %s.' % ( timeout_counter, str( galaxy_repository.name ) ) ) # This timeout currently defaults to 180 seconds, or 3 minutes. if timeout_counter > common.repository_installation_timeout: raise AssertionError( 'Repository installation timed out, %d seconds elapsed, repository state is %s.' % \ diff -r 73b57b7e1b73dbbf8b786d5dc749b67d635f8338 -r aa8204e99326288ea07e1af26c7d3ffd11f0aff1 test/install_and_test_tool_shed_repositories/functional_tests.py --- a/test/install_and_test_tool_shed_repositories/functional_tests.py +++ b/test/install_and_test_tool_shed_repositories/functional_tests.py @@ -363,7 +363,10 @@ return '000000000000' def get_missing_tool_dependencies( repository ): + log.debug( 'Checking %s repository %s for missing tool dependencies.' % ( repository.status, repository.name ) ) missing_tool_dependencies = repository.missing_tool_dependencies + for tool_dependency in repository.tool_dependencies: + log.debug( 'Tool dependency %s version %s has status %s.' % ( tool_dependency.name, tool_dependency.version, tool_dependency.status ) ) for repository_dependency in repository.repository_dependencies: if not repository_dependency.includes_tool_dependencies: continue @@ -687,7 +690,10 @@ tool_dependency_install_path = tool_dependency.installation_directory( app ) uninstalled, error_message = tool_dependency_util.remove_tool_dependency( app, tool_dependency ) if error_message: + log.debug( 'There was an error attempting to remove directory: %s' % str( tool_dependency_install_path ) ) log.debug( error_message ) + else: + log.debug( 'Successfully removed tool dependency installation directory: %s' % str( tool_dependency_install_path ) ) sa_session = app.model.context.current if not uninstalled or tool_dependency.status != app.model.ToolDependency.installation_status.UNINSTALLED: tool_dependency.status = app.model.ToolDependency.installation_status.UNINSTALLED @@ -1107,7 +1113,8 @@ # } if 'missing_test_components' not in repository_status: repository_status[ 'missing_test_components' ] = [] - if repository.missing_tool_dependencies or repository.missing_repository_dependencies: + missing_tool_dependencies = get_missing_tool_dependencies( repository ) + if missing_tool_dependencies or repository.missing_repository_dependencies: # 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. @@ -1143,9 +1150,7 @@ # The deactivate flag is set to True if the environment variable GALAXY_INSTALL_TEST_KEEP_TOOL_DEPENDENCIES # is set to 'true'. if deactivate: - # Recursively retrieve every missing tool dependency for this repository and its required repositories. log.debug( 'Due to the above missing tool dependencies, we are now uninstalling the following tool dependencies, but not changing their repositories.' ) - missing_tool_dependencies = get_missing_tool_dependencies( repository ) for missing_tool_dependency in missing_tool_dependencies: uninstall_tool_dependency( app, missing_tool_dependency ) # We are deactivating this repository and all of its repository dependencies. 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.