1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/6ff0b52b5850/ changeset: 6ff0b52b5850 user: inithello date: 2013-02-05 22:05:33 summary: Bugfixes for tool shed functional test scripts. affected #: 3 files diff -r 2b6800bbce751d434c9b22783a47de0ce522e355 -r 6ff0b52b5850733ed05c06790b351a2bdf66de48 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 @@ -127,6 +127,7 @@ def test_0065_verify_filtering_repository( self ): '''Verify the new tool versions and repository metadata.''' repository = test_db_util.get_repository_by_name_and_owner( repository_name, common.test_user_1_name ) + category = test_db_util.get_category_by_name( 'Test 0000 Basic Repository Features 1' ) tip = self.get_repository_tip( repository ) self.check_for_valid_tools( repository ) strings_displayed = self.get_repository_metadata_revisions( repository ).append( 'Select a revision' ) diff -r 2b6800bbce751d434c9b22783a47de0ce522e355 -r 6ff0b52b5850733ed05c06790b351a2bdf66de48 test/tool_shed/functional/test_0100_complex_repository_dependencies.py --- a/test/tool_shed/functional/test_0100_complex_repository_dependencies.py +++ b/test/tool_shed/functional/test_0100_complex_repository_dependencies.py @@ -39,7 +39,7 @@ strings_displayed=[] ) self.upload_file( repository, 'bwa/complex/tool_dependencies.xml', - strings_displayed=[], + strings_displayed=[ 'Name, version and type from a tool requirement tag does not match' ], commit_message='Uploaded tool_dependencies.xml.' ) self.display_manage_repository_page( repository, strings_displayed=[ 'Tool dependencies', 'may not be', 'in this repository' ] ) def test_0010_create_bwa_base_repository( self ): @@ -148,17 +148,23 @@ commit_message='Uploaded valid complex dependency on bwa_tool_0100.' ) self.check_repository_dependency( base_repository, tool_repository ) self.display_manage_repository_page( base_repository, strings_displayed=[ 'bwa', '0.5.9', 'package' ] ) - def test_0040_update_base_repository( self ): - '''Upload a new tool_dependencies.xml to the tool repository, and verify that the base repository displays the new changeset.''' + def test_0040_generate_tool_dependency( self ): + '''Generate and upload a new tool_dependencies.xml file that specifies an arbitrary file on the filesystem, and verify that bwa_base depends on the new changeset revision.''' base_repository = test_db_util.get_repository_by_name_and_owner( bwa_base_repository_name, common.test_user_1_name ) tool_repository = test_db_util.get_repository_by_name_and_owner( bwa_tool_repository_name, common.test_user_1_name ) previous_changeset = self.get_repository_tip( tool_repository ) + old_tool_dependency = self.get_filename( os.path.join( 'bwa', 'complex', 'readme', 'tool_dependencies.xml' ) ) + new_tool_dependency_path = self.generate_temp_path( 'test_1100', additional_paths=[ 'tool_dependency' ] ) + xml_filename = os.path.abspath( os.path.join( new_tool_dependency_path, 'tool_dependencies.xml' ) ) + # Generate a tool_dependencies.xml file that points to an arbitrary file in the local filesystem. + file( xml_filename, 'w' ).write( file( old_tool_dependency, 'r' ) + .read().replace( '__PATH__', self.get_filename( 'bwa/complex' ) ) ) self.upload_file( tool_repository, - 'bwa/complex/readme/tool_dependencies.xml', + xml_filename, + filepath=new_tool_dependency_path, strings_displayed=[], commit_message='Uploaded new tool_dependencies.xml.' ) # Verify that the dependency display has been updated as a result of the new tool_dependencies.xml file. self.display_manage_repository_page( base_repository, strings_displayed=[ self.get_repository_tip( tool_repository ), 'bwa', '0.5.9', 'package' ], strings_not_displayed=[ previous_changeset ] ) - diff -r 2b6800bbce751d434c9b22783a47de0ce522e355 -r 6ff0b52b5850733ed05c06790b351a2bdf66de48 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 @@ -1,7 +1,6 @@ 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__) + bwa_base_repository_name = 'bwa_base_repository_0100' bwa_base_repository_description = "BWA Base" bwa_base_repository_long_description = "BWA tool that depends on bwa 0.5.9, with a complex repository dependency pointing at bwa_tool_repository_0100" @@ -45,7 +44,6 @@ old_tool_dependency = self.get_filename( os.path.join( 'bwa', 'complex', 'tool_dependencies.xml' ) ) new_tool_dependency_path = self.generate_temp_path( 'test_1100', additional_paths=[ 'tool_dependency' ] ) xml_filename = os.path.abspath( os.path.join( new_tool_dependency_path, 'tool_dependencies.xml' ) ) - log.debug( xml_filename ) file( xml_filename, 'w' ).write( file( old_tool_dependency, 'r' ) .read().replace( '__PATH__', self.get_filename( 'bwa/complex' ) ) ) self.upload_file( repository, @@ -182,7 +180,6 @@ old_tool_dependency = self.get_filename( os.path.join( 'bwa', 'complex', 'readme', 'tool_dependencies.xml' ) ) new_tool_dependency_path = self.generate_temp_path( 'test_1100', additional_paths=[ 'tool_dependency' ] ) xml_filename = os.path.abspath( os.path.join( new_tool_dependency_path, 'tool_dependencies.xml' ) ) - log.debug( xml_filename ) file( xml_filename, 'w' ).write( file( old_tool_dependency, 'r' ) .read().replace( '__PATH__', self.get_filename( 'bwa/complex' ) ) ) self.upload_file( tool_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.