1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/d04aa3ad6132/ changeset: d04aa3ad6132 user: inithello date: 2013-02-15 17:42:19 summary: Enhance tool shed functional tests to be more informative when errors occur. affected #: 23 files
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/base/twilltestcase.py --- a/test/tool_shed/base/twilltestcase.py +++ b/test/tool_shed/base/twilltestcase.py @@ -941,7 +941,10 @@ for data_table in data_tables: if 'name' in table_elem.attrib and table_elem.attrib[ 'name' ] == data_table: file_elem = table_elem.find( 'file' ) - assert os.path.exists( file_elem.attrib[ 'path' ] ), 'Tool data table file %s not found.' % file_elem.path + file_path = file_elem.get( 'path', None ) + full_path = os.path.join( self.tool_data_path, file_path ) + assert file_path is not None, 'No file path configured for this data table.' + assert os.path.exists( full_path ), 'Tool data table file %s not found.' % full_path found = True break assert found, 'No entry for %s in %s.' % ( data_table, self.shed_tool_data_table_conf )
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_0000_basic_repository_features.py --- a/test/tool_shed/functional/test_0000_basic_repository_features.py +++ b/test/tool_shed/functional/test_0000_basic_repository_features.py @@ -83,7 +83,9 @@ repository = test_db_util.get_repository_by_name_and_owner( repository_name, common.test_user_1_name ) self.logout() self.login( email=common.admin_email, username=common.admin_username ) - self.set_repository_malicious( repository, set_malicious=True, strings_displayed=[ 'The repository tip has been defined as malicious.' ] ) + self.set_repository_malicious( repository, + set_malicious=True, + strings_displayed=[ 'The repository tip has been defined as malicious.' ] ) self.set_repository_malicious( repository, set_malicious=False, strings_displayed=[ 'The repository tip has been defined as <b>not</b> malicious.' ] ) @@ -92,8 +94,8 @@ self.set_repository_deprecated( repository, strings_displayed=[ 'has been marked as deprecated', 'Mark as not deprecated' ] ) self.display_manage_repository_page( repository, - strings_displayed=[ 'This repository has been marked as deprecated' ], - strings_not_displayed=[ 'Upload files', 'Reset all repository metadata' ] ) + strings_displayed=[ 'This repository has been marked as deprecated' ], + strings_not_displayed=[ 'Upload files', 'Reset all repository metadata' ] ) self.browse_repository( repository, strings_not_displayed=[ 'Upload files' ] ) self.set_repository_deprecated( repository, strings_displayed=[ 'has been marked as not deprecated', 'Mark as deprecated' ], @@ -197,16 +199,18 @@ def test_0090_verify_reserved_repository_name_handling( self ): '''Check that reserved repository names are handled correctly.''' category = test_db_util.get_category_by_name( 'Test 0000 Basic Repository Features 1' ) + error_message = 'The term <b>repos</b> is a reserved word in the tool shed, so it cannot be used as a repository name.' self.get_or_create_repository( name='repos', description=repository_description, long_description=repository_long_description, owner=common.test_user_1_name, category_id=self.security.encode_id( category.id ), - strings_displayed=[ 'The term <b>repos</b> is a reserved word in the tool shed, so it cannot be used as a repository name.' ] ) + strings_displayed=[ error_message ] ) def test_0100_verify_reserved_username_handling( self ): '''Check that reserved usernames are handled correctly.''' self.logout() self.login( email='baduser@bx.psu.edu', username='repos' ) test_user_1 = test_db_util.get_user( 'baduser@bx.psu.edu' ) assert test_user_1 is None, 'Creating user with public name "repos" succeeded.' - self.check_for_strings( strings_displayed=[ 'The term <b>repos</b> is a reserved word in the tool shed, so it cannot be used as a public user name.' ] ) + error_message = 'The term <b>repos</b> is a reserved word in the tool shed, so it cannot be used as a public user name.' + self.check_for_strings( strings_displayed=[ error_message ] )
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_0020_basic_repository_dependencies.py --- a/test/tool_shed/functional/test_0020_basic_repository_dependencies.py +++ b/test/tool_shed/functional/test_0020_basic_repository_dependencies.py @@ -6,8 +6,8 @@ datatypes_repository_long_description = "Galaxy applicable data formats used by Emboss tools. This repository contains no tools."
emboss_repository_name = 'emboss_0020' -emboss_repository_description = 'Galaxy wrappers for Emboss version 5.0.0 tools' -emboss_repository_long_description = 'Galaxy wrappers for Emboss version 5.0.0 tools' +emboss_repository_description = 'Galaxy wrappers for Emboss version 5.0.0 tools for test 0020' +emboss_repository_long_description = 'Galaxy wrappers for Emboss version 5.0.0 tools for test 0020'
class TestBasicRepositoryDependencies( ShedTwillTestCase ): '''Testing emboss 5 with repository dependencies.''' @@ -93,8 +93,8 @@ 'emboss', '5.0.0', 'package', - datatypes_repository_name, - common.test_user_1_name, + 'emboss_datatypes_0020', + 'user1', changeset_revision, 'Repository dependencies' ] self.display_manage_repository_page( repository, strings_displayed=strings_displayed )
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_0030_repository_dependency_revisions.py --- a/test/tool_shed/functional/test_0030_repository_dependency_revisions.py +++ b/test/tool_shed/functional/test_0030_repository_dependency_revisions.py @@ -1,6 +1,7 @@ from tool_shed.base.twilltestcase import ShedTwillTestCase, common, os import tool_shed.base.test_db_util as test_db_util - +import logging +log = logging.getLogger(__name__) datatypes_repository_name = 'emboss_datatypes_0030' datatypes_repository_description = "Galaxy applicable data formats used by Emboss tools." datatypes_repository_long_description = "Galaxy applicable data formats used by Emboss tools. This repository contains no tools." @@ -8,8 +9,8 @@ emboss_repository_name = 'emboss_0030' emboss_5_repository_name = 'emboss_5_0030' emboss_6_repository_name = 'emboss_6_0030' -emboss_repository_description = 'Galaxy wrappers for Emboss version 5.0.0 tools' -emboss_repository_long_description = 'Galaxy wrappers for Emboss version 5.0.0 tools' +emboss_repository_description = 'Galaxy wrappers for Emboss version 5.0.0 tools for test 0030' +emboss_repository_long_description = 'Galaxy wrappers for Emboss version 5.0.0 tools for test 0030'
class TestRepositoryDependencyRevisions( ShedTwillTestCase ): '''Test dependencies on different revisions of a repository.''' @@ -91,10 +92,10 @@ self.login( email=common.test_user_1_email, username=common.test_user_1_name ) category = test_db_util.get_category_by_name( 'Test 0030 Repository Dependency Revisions' ) repository = self.get_or_create_repository( name=emboss_repository_name, - description=emboss_repository_description, - long_description=emboss_repository_long_description, - owner=common.test_user_1_name, - category_id=self.security.encode_id( category.id ) ) + description=emboss_repository_description, + long_description=emboss_repository_long_description, + owner=common.test_user_1_name, + category_id=self.security.encode_id( category.id ) ) self.upload_file( repository, filename='emboss/emboss.tar', filepath=None, @@ -175,14 +176,8 @@ datatypes_tip = self.get_repository_tip( datatypes_repository ) # Iterate through all metadata revisions and check for repository dependencies. for metadata, changeset_revision in repository_metadata: - strings_displayed = [ str( metadata_elem ) for metadata_elem in metadata[ 'repository_dependencies' ][ 'repository_dependencies' ][ 0 ] ] - # Remove the tool shed URL, because that's not displayed on the page (yet?) - strings_displayed.pop( strings_displayed.index( self.url ) ) # Add the dependency description and datatypes repository details to the strings to check. - strings_displayed.extend( [ metadata[ 'repository_dependencies' ][ 'description' ], - datatypes_repository_name, - datatypes_repository.user.username, - datatypes_tip ] ) + strings_displayed.extend( [ 'Emboss requires the Emboss', 'emboss_datatypes_0030', 'user1', datatypes_tip ] ) strings_displayed.extend( [ 'Tool dependencies', 'emboss', '5.0.0', 'package' ] ) self.display_manage_repository_page( repository, changeset_revision=changeset_revision,
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_0040_repository_circular_dependencies.py --- a/test/tool_shed/functional/test_0040_repository_circular_dependencies.py +++ b/test/tool_shed/functional/test_0040_repository_circular_dependencies.py @@ -2,12 +2,12 @@ import tool_shed.base.test_db_util as test_db_util
freebayes_repository_name = 'freebayes_0040' -freebayes_repository_description = "Galaxy's freebayes tool" -freebayes_repository_long_description = "Long description of Galaxy's freebayes tool" +freebayes_repository_description = "Galaxy's freebayes tool for test 0040" +freebayes_repository_long_description = "Long description of Galaxy's freebayes tool for test 0040"
filtering_repository_name = 'filtering_0040' -filtering_repository_description = "Galaxy's filtering tool" -filtering_repository_long_description = "Long description of Galaxy's filtering tool" +filtering_repository_description = "Galaxy's filtering tool for test 0040" +filtering_repository_long_description = "Long description of Galaxy's filtering tool for test 0040"
class TestRepositoryCircularDependencies( ShedTwillTestCase ): '''Verify that the code correctly displays repositories with circular repository dependencies.'''
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_0400_repository_component_reviews.py --- a/test/tool_shed/functional/test_0400_repository_component_reviews.py +++ b/test/tool_shed/functional/test_0400_repository_component_reviews.py @@ -474,7 +474,7 @@ valid_tools_only=True, uncompress_file=True, remove_repo_files_not_in_tar=False, - commit_message='Uploaded filtering 1.1.0 tarball.', + commit_message='Uploaded filtering test data.', strings_displayed=[], strings_not_displayed=[] ) def test_0110_review_new_changeset_functional_tests( self ):
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_1010_install_repository_with_tool_dependencies.py --- a/test/tool_shed/functional/test_1010_install_repository_with_tool_dependencies.py +++ b/test/tool_shed/functional/test_1010_install_repository_with_tool_dependencies.py @@ -111,10 +111,10 @@ install_tool_dependencies=False, new_tool_panel_section='test_1010' ) installed_repository = test_db_util.get_installed_repository_by_name_owner( repository_name, common.test_user_1_name ) - strings_displayed = [ installed_repository.name, - installed_repository.description, - installed_repository.owner, - installed_repository.tool_shed, + strings_displayed = [ 'freebayes_0010', + "Galaxy's freebayes tool", + 'user1', + self.url.replace( 'http://', '' ), installed_repository.installed_changeset_revision ] self.display_galaxy_browse_repositories_page( strings_displayed=strings_displayed ) self.display_installed_repository_manage_page( installed_repository,
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_1020_install_repository_with_repository_dependencies.py --- a/test/tool_shed/functional/test_1020_install_repository_with_repository_dependencies.py +++ b/test/tool_shed/functional/test_1020_install_repository_with_repository_dependencies.py @@ -6,8 +6,8 @@ datatypes_repository_long_description = "Galaxy applicable data formats used by Emboss tools. This repository contains no tools."
emboss_repository_name = 'emboss_0020' -emboss_repository_description = 'Galaxy wrappers for Emboss version 5.0.0 tools' -emboss_repository_long_description = 'Galaxy wrappers for Emboss version 5.0.0 tools' +emboss_repository_description = 'Galaxy wrappers for Emboss version 5.0.0 tools for test 0020' +emboss_repository_long_description = 'Galaxy wrappers for Emboss version 5.0.0 tools for test 0020'
base_datatypes_count = 0 repository_datatypes_count = 0 @@ -103,10 +103,10 @@ install_tool_dependencies=False, new_tool_panel_section='test_1020' ) installed_repository = test_db_util.get_installed_repository_by_name_owner( 'emboss_0020', common.test_user_1_name ) - strings_displayed = [ installed_repository.name, - installed_repository.description, - installed_repository.owner, - installed_repository.tool_shed, + strings_displayed = [ 'emboss_0020', + 'Galaxy wrappers for Emboss version 5.0.0 tools for test 0020', + 'user1', + self.url.replace( 'http://', '' ), installed_repository.installed_changeset_revision ] self.display_galaxy_browse_repositories_page( strings_displayed=strings_displayed ) self.display_installed_repository_manage_page( installed_repository,
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_1030_install_repository_with_dependency_revisions.py --- a/test/tool_shed/functional/test_1030_install_repository_with_dependency_revisions.py +++ b/test/tool_shed/functional/test_1030_install_repository_with_dependency_revisions.py @@ -8,8 +8,8 @@ emboss_repository_name = 'emboss_0030' emboss_5_repository_name = 'emboss_5_0030' emboss_6_repository_name = 'emboss_6_0030' -emboss_repository_description = 'Galaxy wrappers for Emboss version 5.0.0 tools' -emboss_repository_long_description = 'Galaxy wrappers for Emboss version 5.0.0 tools' +emboss_repository_description = 'Galaxy wrappers for Emboss version 5.0.0 tools for test 0030' +emboss_repository_long_description = 'Galaxy wrappers for Emboss version 5.0.0 tools for test 0030'
base_datatypes_count = 0 repository_datatypes_count = 0 @@ -173,8 +173,8 @@ install_tool_dependencies=False, new_tool_panel_section='test_1030' ) installed_repository = test_db_util.get_installed_repository_by_name_owner( 'emboss_0030', common.test_user_1_name ) - strings_displayed = [ installed_repository.name, - installed_repository.description, + strings_displayed = [ 'emboss_0030', + 'Galaxy wrappers for Emboss version 5.0.0 tools for test 0030', installed_repository.owner, installed_repository.tool_shed, installed_repository.installed_changeset_revision ]
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_1040_install_repository_basic_circular_dependencies.py --- a/test/tool_shed/functional/test_1040_install_repository_basic_circular_dependencies.py +++ b/test/tool_shed/functional/test_1040_install_repository_basic_circular_dependencies.py @@ -2,12 +2,12 @@ import tool_shed.base.test_db_util as test_db_util
freebayes_repository_name = 'freebayes_0040' -freebayes_repository_description = "Galaxy's freebayes tool" -freebayes_repository_long_description = "Long description of Galaxy's freebayes tool" +freebayes_repository_description = "Galaxy's freebayes tool for test 0040" +freebayes_repository_long_description = "Long description of Galaxy's freebayes tool for test 0040"
filtering_repository_name = 'filtering_0040' -filtering_repository_description = "Galaxy's filtering tool" -filtering_repository_long_description = "Long description of Galaxy's filtering tool" +filtering_repository_description = "Galaxy's filtering tool for test 0040" +filtering_repository_long_description = "Long description of Galaxy's filtering tool for test 0040"
category_name = 'test_0040_repository_circular_dependencies'
@@ -164,6 +164,6 @@ self.check_galaxy_repository_tool_panel_section( installed_freebayes_repository, 'freebayes' ) strings_displayed = [ 'Missing repository', 'freebayes' ] self.display_installed_repository_manage_page( installed_filtering_repository, strings_displayed=strings_displayed ) - self.check_galaxy_repository_db_status( freebayes_repository_name, - common.test_user_1_name, + self.check_galaxy_repository_db_status( 'freebayes_0040', + 'user1', 'Uninstalled' )
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_1050_circular_dependencies_4_levels.py --- a/test/tool_shed/functional/test_1050_circular_dependencies_4_levels.py +++ b/test/tool_shed/functional/test_1050_circular_dependencies_4_levels.py @@ -343,9 +343,9 @@ assert original_datatypes < self.get_datatypes_count(), 'Installing a repository that depends on emboss_datatypes did not add datatypes.' emboss_repository = test_db_util.get_installed_repository_by_name_owner( emboss_repository_name, common.test_user_1_name ) datatypes_repository = test_db_util.get_installed_repository_by_name_owner( emboss_datatypes_repository_name, common.test_user_1_name ) - strings_displayed = [ emboss_repository.name, + strings_displayed = [ 'emboss_0050', + 'emboss_datatypes_0050', emboss_repository.installed_changeset_revision, - datatypes_repository.name, datatypes_repository.installed_changeset_revision ] self.display_galaxy_browse_repositories_page( strings_displayed=strings_displayed ) # Installing freebayes should automatically reinstall emboss and reactivate emboss_datatypes.
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_1060_install_repository_with_workflow.py --- a/test/tool_shed/functional/test_1060_install_repository_with_workflow.py +++ b/test/tool_shed/functional/test_1060_install_repository_with_workflow.py @@ -84,6 +84,6 @@ workflow_name, strings_displayed=[ '#EBD9B2' ], strings_not_displayed=[ '#EBBCB2' ] ) - self.display_all_workflows( strings_not_displayed=[ workflow_name ] ) + self.display_all_workflows( strings_not_displayed=[ 'Workflow for 0060_filter_workflow_repository' ] ) self.import_workflow( installed_repository, workflow_name ) - self.display_all_workflows( strings_displayed=[ workflow_name ] ) + self.display_all_workflows( strings_displayed=[ 'Workflow for 0060_filter_workflow_repository' ] )
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_1070_invalid_tool.py --- a/test/tool_shed/functional/test_1070_invalid_tool.py +++ b/test/tool_shed/functional/test_1070_invalid_tool.py @@ -73,10 +73,10 @@ install_tool_dependencies=False, new_tool_panel_section='test_1070' ) installed_repository = test_db_util.get_installed_repository_by_name_owner( repository_name, common.test_user_1_name ) - strings_displayed = [ installed_repository.name, - installed_repository.description, - installed_repository.owner, - installed_repository.tool_shed, + strings_displayed = [ 'bismark_0070', + "Galaxy's bismark wrapper", + 'user1', + self.url.replace( 'http://', '' ), installed_repository.installed_changeset_revision ] self.display_galaxy_browse_repositories_page( strings_displayed=strings_displayed ) self.display_installed_repository_manage_page( installed_repository,
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_1080_advanced_circular_dependency_installation.py --- a/test/tool_shed/functional/test_1080_advanced_circular_dependency_installation.py +++ b/test/tool_shed/functional/test_1080_advanced_circular_dependency_installation.py @@ -131,15 +131,15 @@ common.test_user_1_name ) installed_column_repository = test_db_util.get_installed_repository_by_name_owner( column_repository_name, common.test_user_1_name ) - browse_strings_displayed = [ installed_convert_repository.name, - installed_convert_repository.description, - installed_convert_repository.tool_shed, + browse_strings_displayed = [ 'convert_chars_0080', + 'Convert delimiters', + self.url.replace( 'http://', '' ), installed_convert_repository.installed_changeset_revision ] - strings_displayed = [ installed_convert_repository.name, - installed_convert_repository.description, - installed_convert_repository.tool_shed, + strings_displayed = [ 'convert_chars_0080', + 'Convert delimiters', + self.url.replace( 'http://', '' ), installed_convert_repository.installed_changeset_revision, - installed_column_repository.name, + 'column_maker_0080', installed_column_repository.installed_changeset_revision, 'Missing repository dependencies' ] self.display_galaxy_browse_repositories_page( strings_displayed=browse_strings_displayed ) @@ -157,18 +157,18 @@ common.test_user_1_name ) installed_column_repository = test_db_util.get_installed_repository_by_name_owner( column_repository_name, common.test_user_1_name ) - browse_strings_displayed = [ installed_convert_repository.name, - installed_convert_repository.description, - installed_convert_repository.tool_shed, + browse_strings_displayed = [ 'convert_chars_0080', + 'Convert delimiters', + self.url.replace( 'http://', '' ), installed_convert_repository.installed_changeset_revision, - installed_column_repository.name, - installed_column_repository.description, + 'column_maker_0080', + 'Add column', installed_column_repository.installed_changeset_revision ] - strings_displayed = [ installed_column_repository.name, - installed_column_repository.description, - installed_column_repository.tool_shed, + strings_displayed = [ 'column_maker_0080', + 'Add column', + self.url.replace( 'http://', '' ), installed_column_repository.installed_changeset_revision, - installed_convert_repository.name, + 'convert_chars_0080', installed_convert_repository.installed_changeset_revision, 'Installed repository dependencies' ] self.display_galaxy_browse_repositories_page( strings_displayed=browse_strings_displayed ) @@ -181,11 +181,11 @@ installed_column_repository = test_db_util.get_installed_repository_by_name_owner( column_repository_name, common.test_user_1_name ) self.uninstall_repository( installed_convert_repository, remove_from_disk=False ) - strings_displayed = [ installed_column_repository.name, - installed_column_repository.description, - installed_column_repository.tool_shed, + strings_displayed = [ 'column_maker_0080', + 'Add column', + self.url.replace( 'http://', '' ), installed_column_repository.installed_changeset_revision, - installed_convert_repository.name, + 'convert_chars_0080', installed_convert_repository.installed_changeset_revision, 'Missing repository dependencies', 'Deactivated' ] @@ -198,11 +198,11 @@ installed_column_repository = test_db_util.get_installed_repository_by_name_owner( column_repository_name, common.test_user_1_name ) self.reactivate_repository( installed_convert_repository ) - strings_displayed = [ installed_convert_repository.name, - installed_convert_repository.description, - installed_convert_repository.tool_shed, + strings_displayed = [ 'convert_chars_0080', + 'Convert delimiters', + self.url.replace( 'http://', '' ), installed_convert_repository.installed_changeset_revision, - installed_column_repository.name, + 'column_maker_0080', installed_column_repository.installed_changeset_revision, 'Installed repository dependencies' ] def test_0040_deactivate_column_repository( self ): @@ -212,11 +212,11 @@ installed_column_repository = test_db_util.get_installed_repository_by_name_owner( column_repository_name, common.test_user_1_name ) self.uninstall_repository( installed_column_repository, remove_from_disk=False ) - strings_displayed = [ installed_convert_repository.name, - installed_convert_repository.description, - installed_convert_repository.tool_shed, + strings_displayed = [ 'convert_chars_0080', + 'Convert delimiters', + self.url.replace( 'http://', '' ), installed_convert_repository.installed_changeset_revision, - installed_column_repository.name, + 'column_maker_0080', installed_column_repository.installed_changeset_revision, 'Missing repository dependencies', 'Deactivated' ] @@ -229,9 +229,9 @@ installed_column_repository = test_db_util.get_installed_repository_by_name_owner( column_repository_name, common.test_user_1_name ) self.uninstall_repository( installed_convert_repository, remove_from_disk=False ) - strings_not_displayed = [ installed_column_repository.name, + strings_not_displayed = [ 'column_maker_0080', installed_column_repository.installed_changeset_revision, - installed_convert_repository.name, + 'convert_chars_0080', installed_convert_repository.installed_changeset_revision ] self.display_galaxy_browse_repositories_page( strings_not_displayed=strings_not_displayed ) def test_0050_reactivate_column_repository( self ): @@ -241,11 +241,11 @@ installed_column_repository = test_db_util.get_installed_repository_by_name_owner( column_repository_name, common.test_user_1_name ) self.reactivate_repository( installed_column_repository ) - strings_displayed = [ installed_column_repository.name, - installed_column_repository.description, - installed_column_repository.tool_shed, + strings_displayed = [ 'column_maker_0080', + 'Add column', + self.url.replace( 'http://', '' ), installed_column_repository.installed_changeset_revision, - installed_convert_repository.name, + 'convert_chars_0080', installed_convert_repository.installed_changeset_revision, 'Missing repository dependencies', 'Deactivated' ] @@ -258,20 +258,20 @@ installed_column_repository = test_db_util.get_installed_repository_by_name_owner( column_repository_name, common.test_user_1_name ) self.reactivate_repository( installed_convert_repository ) - strings_displayed = [ installed_column_repository.name, - installed_column_repository.description, - installed_column_repository.tool_shed, + strings_displayed = [ 'column_maker_0080', + 'Add column', + self.url.replace( 'http://', '' ), installed_column_repository.installed_changeset_revision, - installed_convert_repository.name, + 'convert_chars_0080', installed_convert_repository.installed_changeset_revision, 'Installed repository dependencies' ] self.display_installed_repository_manage_page( installed_column_repository, strings_displayed=strings_displayed ) - strings_displayed = [ installed_convert_repository.name, - installed_convert_repository.description, - installed_convert_repository.tool_shed, + strings_displayed = [ 'convert_chars_0080', + 'Convert delimiters', + self.url.replace( 'http://', '' ), installed_convert_repository.installed_changeset_revision, - installed_column_repository.name, + 'column_maker_0080', installed_column_repository.installed_changeset_revision, 'Installed repository dependencies' ] self.display_installed_repository_manage_page( installed_convert_repository, @@ -283,11 +283,11 @@ installed_column_repository = test_db_util.get_installed_repository_by_name_owner( column_repository_name, common.test_user_1_name ) self.uninstall_repository( installed_column_repository, remove_from_disk=True ) - strings_displayed = [ installed_convert_repository.name, - installed_convert_repository.description, - installed_convert_repository.tool_shed, + strings_displayed = [ 'convert_chars_0080', + 'Convert delimiters', + self.url.replace( 'http://', '' ), installed_convert_repository.installed_changeset_revision, - installed_column_repository.name, + 'column_maker_0080', installed_column_repository.installed_changeset_revision, 'Missing repository dependencies', 'Uninstalled' ] @@ -301,20 +301,20 @@ installed_column_repository = test_db_util.get_installed_repository_by_name_owner( column_repository_name, common.test_user_1_name ) self.reinstall_repository( installed_column_repository, install_repository_dependencies=False ) - strings_displayed = [ installed_column_repository.name, - installed_column_repository.description, - installed_column_repository.tool_shed, + strings_displayed = [ 'column_maker_0080', + 'Add column', + self.url.replace( 'http://', '' ), installed_column_repository.installed_changeset_revision, - installed_convert_repository.name, + 'convert_chars_0080', installed_convert_repository.installed_changeset_revision, 'Installed repository dependencies' ] self.display_installed_repository_manage_page( installed_column_repository, strings_displayed=strings_displayed ) - strings_displayed = [ installed_convert_repository.name, - installed_convert_repository.description, - installed_convert_repository.tool_shed, + strings_displayed = [ 'convert_chars_0080', + 'Convert delimiters', + self.url.replace( 'http://', '' ), installed_convert_repository.installed_changeset_revision, - installed_column_repository.name, + 'column_maker_0080', installed_column_repository.installed_changeset_revision, 'Installed repository dependencies' ] self.display_installed_repository_manage_page( installed_convert_repository, @@ -326,11 +326,11 @@ installed_column_repository = test_db_util.get_installed_repository_by_name_owner( column_repository_name, common.test_user_1_name ) self.uninstall_repository( installed_convert_repository, remove_from_disk=True ) - strings_displayed = [ installed_column_repository.name, - installed_column_repository.description, - installed_column_repository.tool_shed, + strings_displayed = [ 'column_maker_0080', + 'Add column', + self.url.replace( 'http://', '' ), installed_column_repository.installed_changeset_revision, - installed_convert_repository.name, + 'convert_chars_0080', installed_convert_repository.installed_changeset_revision, 'Missing repository dependencies', 'Uninstalled' ] @@ -344,11 +344,11 @@ installed_column_repository = test_db_util.get_installed_repository_by_name_owner( column_repository_name, common.test_user_1_name ) self.uninstall_repository( installed_column_repository, remove_from_disk=True ) - strings_displayed = [ installed_convert_repository.name, - installed_convert_repository.description, - installed_convert_repository.tool_shed, + strings_displayed = [ 'convert_chars_0080', + 'Convert delimiters', + self.url.replace( 'http://', '' ), installed_convert_repository.installed_changeset_revision, - installed_column_repository.name, + 'column_maker_0080', installed_column_repository.installed_changeset_revision, 'Missing repository dependencies', 'Activate or reinstall repository', @@ -365,20 +365,20 @@ install_repository_dependencies=True, no_changes=False, new_tool_panel_section='convert_maker' ) - strings_displayed = [ installed_column_repository.name, - installed_column_repository.description, - installed_column_repository.tool_shed, + strings_displayed = [ 'column_maker_0080', + 'Add column', + self.url.replace( 'http://', '' ), installed_column_repository.installed_changeset_revision, - installed_convert_repository.name, + 'convert_chars_0080', installed_convert_repository.installed_changeset_revision, 'Installed repository dependencies' ] self.display_installed_repository_manage_page( installed_column_repository, strings_displayed=strings_displayed ) - strings_displayed = [ installed_convert_repository.name, - installed_convert_repository.description, - installed_convert_repository.tool_shed, + strings_displayed = [ 'convert_chars_0080', + 'Convert delimiters', + self.url.replace( 'http://', '' ), installed_convert_repository.installed_changeset_revision, - installed_column_repository.name, + 'column_maker_0080', installed_column_repository.installed_changeset_revision, 'Installed repository dependencies' ] self.display_installed_repository_manage_page( installed_convert_repository,
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_1085_repository_dependency_handling.py --- a/test/tool_shed/functional/test_1085_repository_dependency_handling.py +++ b/test/tool_shed/functional/test_1085_repository_dependency_handling.py @@ -122,18 +122,18 @@ common.test_user_1_name ) installed_column_repository = test_db_util.get_installed_repository_by_name_owner( column_repository_name, common.test_user_1_name ) - browse_strings_displayed = [ installed_convert_repository.name, - installed_convert_repository.description, - installed_convert_repository.tool_shed, + browse_strings_displayed = [ 'convert_chars_1085', + 'Convert delimiters', + self.url.replace( 'http://', '' ), installed_convert_repository.installed_changeset_revision, - installed_column_repository.name, - installed_column_repository.description, + 'column_maker_1085', + 'Add column', installed_column_repository.installed_changeset_revision ] - strings_displayed = [ installed_convert_repository.name, - installed_convert_repository.description, - installed_convert_repository.tool_shed, + strings_displayed = [ 'convert_chars_1085', + 'Convert delimiters', + self.url.replace( 'http://', '' ), installed_convert_repository.installed_changeset_revision, - installed_column_repository.name, + 'column_maker_1085', installed_column_repository.installed_changeset_revision, 'Installed repository dependencies' ] self.display_galaxy_browse_repositories_page( strings_displayed=browse_strings_displayed ) @@ -161,9 +161,9 @@ install_repository_dependencies=False, new_tool_panel_section='new_column_maker', no_changes=False ) - strings_displayed = [ installed_column_repository.name, - installed_column_repository.description, - installed_column_repository.tool_shed, + strings_displayed = [ 'column_maker_1085', + 'Add column', + self.url.replace( 'http://', '' ), installed_column_repository.installed_changeset_revision ] self.display_installed_repository_manage_page( installed_column_repository, strings_displayed=strings_displayed ) @@ -176,9 +176,9 @@ install_repository_dependencies=False, new_tool_panel_section='new_convert_chars', no_changes=False ) - strings_displayed = [ installed_convert_repository.name, - installed_convert_repository.description, - installed_convert_repository.tool_shed, + strings_displayed = [ 'convert_chars_1085', + 'Convert delimiters', + self.url.replace( 'http://', '' ), installed_convert_repository.installed_changeset_revision ] self.display_installed_repository_manage_page( installed_convert_repository, strings_displayed=strings_displayed )
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_1087_install_updated_repository_dependencies.py --- a/test/tool_shed/functional/test_1087_install_updated_repository_dependencies.py +++ b/test/tool_shed/functional/test_1087_install_updated_repository_dependencies.py @@ -103,7 +103,7 @@ '''Reinstall column_maker and verify that it now shows repository dependencies.''' installed_column_repository = test_db_util.get_installed_repository_by_name_owner( column_repository_name, common.test_user_1_name ) convert_repository = test_db_util.get_repository_by_name_and_owner( convert_repository_name, common.test_user_1_name ) - strings_displayed=[ 'Handle repository dependencies', convert_repository.name, self.get_repository_tip( convert_repository ) ] + strings_displayed=[ 'Handle repository dependencies', 'convert_chars_1087', self.get_repository_tip( convert_repository ) ] # Due to twill's limitations, only check for strings on the (redirected) reselect tool panel section page, don't actually reinstall. url = '/admin_toolshed/browse_repositories?operation=activate+or+reinstall&id=%s' % self.security.encode_id( installed_column_repository.id ) self.visit_galaxy_url( url )
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_1090_install_tool_from_tool_search.py --- a/test/tool_shed/functional/test_1090_install_tool_from_tool_search.py +++ b/test/tool_shed/functional/test_1090_install_tool_from_tool_search.py @@ -270,9 +270,9 @@ bwa_color_revision = self.get_repository_tip( bwa_color_repository ) self.search_for_valid_tools( search_fields={ 'tool_id': 'bwa' }, exact_matches=False, from_galaxy=True, - strings_displayed=[ bwa_color_repository_name, bwa_base_repository_name, bwa_base_revision, bwa_color_revision ] ) - strings_displayed=[ freebayes_repository_name, emboss_repository_name, filtering_repository_name ] - strings_displayed.extend( [ bwa_color_repository_name, bwa_base_repository_name, emboss_datatypes_repository_name ] ) + strings_displayed=[ 'bwa_color_0090', 'bwa_base_0090', bwa_base_revision, bwa_color_revision ] ) + strings_displayed=[ 'freebayes_0090', 'emboss_0090', 'filtering_0090' ] + strings_displayed.extend( [ 'bwa_color_0090', 'bwa_base_0090', 'emboss_datatypes_0090' ] ) strings_displayed.extend( [ 'bwa', 'Handle', 'tool dependencies' ] ) repositories_to_install = [ bwa_color_repository, bwa_base_repository ] # BWA is a good candidate for testing the installation of tool dependencies, but it is a core requirement of functional
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_1100_install_repository_with_complex_dependencies.py --- a/test/tool_shed/functional/test_1100_install_repository_with_complex_dependencies.py +++ b/test/tool_shed/functional/test_1100_install_repository_with_complex_dependencies.py @@ -243,11 +243,11 @@ strings_displayed.append( self.url.replace( 'http://', '' ) ) self.display_galaxy_browse_repositories_page( strings_displayed=strings_displayed, strings_not_displayed=[] ) checks = [ ( tool_repository, - [ tool_repository.name, tool_repository.owner, tool_repository.installed_changeset_revision ], + [ 'bwa_tool_repository_0100', 'user1', tool_repository.installed_changeset_revision ], [ 'Missing tool dependencies' ] ), ( base_repository, - [ base_repository.name, base_repository.owner, base_repository.installed_changeset_revision, tool_repository.name, - tool_repository.owner, tool_repository.installed_changeset_revision ], + [ 'bwa_base_repository_0100', 'user1', base_repository.installed_changeset_revision, 'bwa_tool_repository_0100', + tool_repository.installed_changeset_revision ], [ 'Missing tool dependencies' ] ) ] for repository, strings_displayed, strings_not_displayed in checks: self.display_installed_repository_manage_page( repository, strings_displayed=strings_displayed, strings_not_displayed=strings_not_displayed )
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_1110_install_repository_with_invalid_repository_dependency.py --- a/test/tool_shed/functional/test_1110_install_repository_with_invalid_repository_dependency.py +++ b/test/tool_shed/functional/test_1110_install_repository_with_invalid_repository_dependency.py @@ -174,7 +174,7 @@ self.galaxy_logout() self.galaxy_login( email=common.admin_email, username=common.admin_username ) repository = test_db_util.get_repository_by_name_and_owner( emboss_repository_name, common.test_user_1_name ) - preview_strings_displayed = [ repository.name, self.get_repository_tip( repository ), 'will be ignored' ] + preview_strings_displayed = [ 'emboss_0110', self.get_repository_tip( repository ), 'will be ignored' ] self.install_repository( emboss_repository_name, common.test_user_1_name, category_name,
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_1200_uninstall_and_reinstall_basic_repository.py --- a/test/tool_shed/functional/test_1200_uninstall_and_reinstall_basic_repository.py +++ b/test/tool_shed/functional/test_1200_uninstall_and_reinstall_basic_repository.py @@ -77,28 +77,28 @@ 'Test 0000 Basic Repository Features 1', new_tool_panel_section='test_1000' ) installed_repository = test_db_util.get_installed_repository_by_name_owner( 'filtering_0000', common.test_user_1_name ) - strings_displayed = [ installed_repository.name, - installed_repository.description, - installed_repository.owner, - installed_repository.tool_shed, + strings_displayed = [ 'filtering_0000', + "Galaxy's filtering tool for test 0000", + 'user1', + self.url.replace( 'http://', '' ), installed_repository.installed_changeset_revision ] self.display_galaxy_browse_repositories_page( strings_displayed=strings_displayed ) def test_0015_uninstall_filtering_repository( self ): '''Uninstall the filtering repository.''' installed_repository = test_db_util.get_installed_repository_by_name_owner( 'filtering_0000', common.test_user_1_name ) self.uninstall_repository( installed_repository, remove_from_disk=True ) - strings_not_displayed = [ installed_repository.name, - installed_repository.description, + strings_not_displayed = [ 'filtering_0000', + "Galaxy's filtering tool for test 0000", installed_repository.installed_changeset_revision ] self.display_galaxy_browse_repositories_page( strings_not_displayed=strings_not_displayed ) def test_0020_reinstall_filtering_repository( self ): '''Reinstall the filtering repository.''' installed_repository = test_db_util.get_installed_repository_by_name_owner( 'filtering_0000', common.test_user_1_name ) self.reinstall_repository( installed_repository ) - strings_displayed = [ installed_repository.name, - installed_repository.description, - installed_repository.owner, - installed_repository.tool_shed, + strings_displayed = [ 'filtering_0000', + "Galaxy's filtering tool for test 0000", + 'user1', + self.url.replace( 'http://', '' ), installed_repository.installed_changeset_revision ] self.display_galaxy_browse_repositories_page( strings_displayed=strings_displayed ) self.display_installed_repository_manage_page( installed_repository, @@ -108,18 +108,18 @@ '''Deactivate the filtering repository without removing it from disk.''' installed_repository = test_db_util.get_installed_repository_by_name_owner( 'filtering_0000', common.test_user_1_name ) self.uninstall_repository( installed_repository, remove_from_disk=False ) - strings_not_displayed = [ installed_repository.name, - installed_repository.description, + strings_not_displayed = [ 'filtering_0000', + "Galaxy's filtering tool for test 0000", installed_repository.installed_changeset_revision ] self.display_galaxy_browse_repositories_page( strings_not_displayed=strings_not_displayed ) def test_0030_reactivate_filtering_repository( self ): '''Reactivate the filtering repository and verify that it now shows up in the list of installed repositories.''' installed_repository = test_db_util.get_installed_repository_by_name_owner( 'filtering_0000', common.test_user_1_name ) self.reactivate_repository( installed_repository ) - strings_displayed = [ installed_repository.name, - installed_repository.description, - installed_repository.owner, - installed_repository.tool_shed, + strings_displayed = [ 'filtering_0000', + "Galaxy's filtering tool for test 0000", + 'user1', + self.url.replace( 'http://', '' ), installed_repository.installed_changeset_revision ] self.display_galaxy_browse_repositories_page( strings_displayed=strings_displayed ) self.display_installed_repository_manage_page( installed_repository,
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_1210_uninstall_reinstall_repository_with_tool_dependencies.py --- a/test/tool_shed/functional/test_1210_uninstall_reinstall_repository_with_tool_dependencies.py +++ b/test/tool_shed/functional/test_1210_uninstall_reinstall_repository_with_tool_dependencies.py @@ -96,10 +96,10 @@ strings_displayed=strings_displayed, new_tool_panel_section='test_1210' ) installed_repository = test_db_util.get_installed_repository_by_name_owner( 'freebayes_0010', common.test_user_1_name ) - strings_displayed = [ installed_repository.name, - installed_repository.description, - installed_repository.owner, - installed_repository.tool_shed, + strings_displayed = [ 'freebayes_0010', + "Galaxy's freebayes tool", + 'user1', + self.url.replace( 'http://', '' ), installed_repository.installed_changeset_revision ] self.display_galaxy_browse_repositories_page( strings_displayed=strings_displayed ) def test_0015_uninstall_freebayes_repository( self ): @@ -112,10 +112,10 @@ '''Reinstall the freebayes repository.''' installed_repository = test_db_util.get_installed_repository_by_name_owner( 'freebayes_0010', common.test_user_1_name ) self.reinstall_repository( installed_repository ) - strings_displayed = [ installed_repository.name, - installed_repository.description, - installed_repository.owner, - installed_repository.tool_shed, + strings_displayed = [ 'freebayes_0010', + "Galaxy's freebayes tool", + 'user1', + self.url.replace( 'http://', '' ), installed_repository.installed_changeset_revision ] self.display_galaxy_browse_repositories_page( strings_displayed=strings_displayed ) self.display_installed_repository_manage_page( installed_repository, @@ -131,10 +131,10 @@ '''Reactivate the freebayes repository and verify that it now shows up in the list of installed repositories.''' installed_repository = test_db_util.get_installed_repository_by_name_owner( 'freebayes_0010', common.test_user_1_name ) self.reactivate_repository( installed_repository ) - strings_displayed = [ installed_repository.name, - installed_repository.description, - installed_repository.owner, - installed_repository.tool_shed, + strings_displayed = [ 'freebayes_0010', + "Galaxy's freebayes tool", + 'user1', + self.url.replace( 'http://', '' ), installed_repository.installed_changeset_revision ] self.display_galaxy_browse_repositories_page( strings_displayed=strings_displayed ) self.display_installed_repository_manage_page( installed_repository,
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_1220_uninstall_reinstall_repository_with_repository_dependencies.py --- a/test/tool_shed/functional/test_1220_uninstall_reinstall_repository_with_repository_dependencies.py +++ b/test/tool_shed/functional/test_1220_uninstall_reinstall_repository_with_repository_dependencies.py @@ -98,10 +98,10 @@ strings_displayed=strings_displayed, new_tool_panel_section='test_1210' ) installed_repository = test_db_util.get_installed_repository_by_name_owner( emboss_repository_name, common.test_user_1_name ) - strings_displayed = [ installed_repository.name, - installed_repository.description, - installed_repository.owner, - installed_repository.tool_shed, + strings_displayed = [ 'emboss_0020', + 'Galaxy wrappers for Emboss version 5.0.0 tools', + 'user1', + self.url.replace( 'http://', '' ), installed_repository.installed_changeset_revision ] self.display_galaxy_browse_repositories_page( strings_displayed=strings_displayed ) current_datatypes = int( self.get_datatypes_count() ) @@ -122,10 +122,10 @@ '''Reinstall the emboss repository.''' installed_repository = test_db_util.get_installed_repository_by_name_owner( emboss_repository_name, common.test_user_1_name ) self.reinstall_repository( installed_repository ) - strings_displayed = [ installed_repository.name, - installed_repository.description, - installed_repository.owner, - installed_repository.tool_shed, + strings_displayed = [ 'emboss_0020', + 'Galaxy wrappers for Emboss version 5.0.0 tools', + 'user1', + self.url.replace( 'http://', '' ), installed_repository.installed_changeset_revision ] self.display_galaxy_browse_repositories_page( strings_displayed=strings_displayed ) self.display_installed_repository_manage_page( installed_repository, @@ -135,17 +135,17 @@ '''Deactivate the emboss repository without removing it from disk.''' installed_repository = test_db_util.get_installed_repository_by_name_owner( emboss_repository_name, common.test_user_1_name ) self.uninstall_repository( installed_repository, remove_from_disk=False ) - strings_not_displayed = [ installed_repository.name, + strings_not_displayed = [ 'emboss_0020', installed_repository.installed_changeset_revision ] self.display_galaxy_browse_repositories_page( strings_not_displayed=strings_not_displayed ) def test_0030_reactivate_emboss_repository( self ): '''Reactivate the emboss repository and verify that it now shows up in the list of installed repositories.''' installed_repository = test_db_util.get_installed_repository_by_name_owner( emboss_repository_name, common.test_user_1_name ) self.reactivate_repository( installed_repository ) - strings_displayed = [ installed_repository.name, - installed_repository.description, - installed_repository.owner, - installed_repository.tool_shed, + strings_displayed = [ 'emboss_0020', + 'Galaxy wrappers for Emboss version 5.0.0 tools', + 'user1', + self.url.replace( 'http://', '' ), installed_repository.installed_changeset_revision ] self.display_galaxy_browse_repositories_page( strings_displayed=strings_displayed ) self.display_installed_repository_manage_page( installed_repository,
diff -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 -r d04aa3ad613211d3c88f1daa7e5a9df4d1233597 test/tool_shed/functional/test_1230_uninstall_reinstall_repository_with_dependency_revisions.py --- a/test/tool_shed/functional/test_1230_uninstall_reinstall_repository_with_dependency_revisions.py +++ b/test/tool_shed/functional/test_1230_uninstall_reinstall_repository_with_dependency_revisions.py @@ -158,10 +158,10 @@ strings_displayed=strings_displayed, new_tool_panel_section='test_1210' ) installed_repository = test_db_util.get_installed_repository_by_name_owner( emboss_repository_name, common.test_user_1_name ) - strings_displayed = [ installed_repository.name, - installed_repository.description, - installed_repository.owner, - installed_repository.tool_shed, + strings_displayed = [ 'emboss_0030', + 'Galaxy wrappers for Emboss version 5.0.0 tools', + 'user1', + self.url.replace( 'http://', '' ), installed_repository.installed_changeset_revision ] self.display_galaxy_browse_repositories_page( strings_displayed=strings_displayed ) current_datatypes = int( self.get_datatypes_count() ) @@ -182,10 +182,10 @@ '''Reinstall the emboss repository.''' installed_repository = test_db_util.get_installed_repository_by_name_owner( emboss_repository_name, common.test_user_1_name ) self.reinstall_repository( installed_repository ) - strings_displayed = [ installed_repository.name, - installed_repository.description, - installed_repository.owner, - installed_repository.tool_shed, + strings_displayed = [ 'emboss_0030', + 'Galaxy wrappers for Emboss version 5.0.0 tools', + 'user1', + self.url.replace( 'http://', '' ), installed_repository.installed_changeset_revision ] self.display_galaxy_browse_repositories_page( strings_displayed=strings_displayed ) self.display_installed_repository_manage_page( installed_repository, @@ -201,10 +201,10 @@ '''Reactivate the emboss repository and verify that it now shows up in the list of installed repositories.''' installed_repository = test_db_util.get_installed_repository_by_name_owner( emboss_repository_name, common.test_user_1_name ) self.reactivate_repository( installed_repository ) - strings_displayed = [ installed_repository.name, - installed_repository.description, - installed_repository.owner, - installed_repository.tool_shed, + strings_displayed = [ 'emboss_0030', + 'Galaxy wrappers for Emboss version 5.0.0 tools', + 'user1', + self.url.replace( 'http://', '' ), installed_repository.installed_changeset_revision ] self.display_galaxy_browse_repositories_page( strings_displayed=strings_displayed ) self.display_installed_repository_manage_page( installed_repository,
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.