From 17783cec36f4bf0d3b79137842dad52a64f80da2 Mon Sep 17 00:00:00 2001 From: peterjc Date: Tue, 2 Aug 2016 10:37:44 +0100 Subject: [PATCH] Tweak testing installing BLAST datatypes from Tool Shed This is a short term pragmatic solution for the planned return of the BLAST datatypes to the main Galaxy distribution. Long term an additional test using an alternative Tool Shed defined datatype may be needed. --- .../test_1140_simple_repository_dependency_multiple_owners.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/shed_functional/functional/test_1140_simple_repository_dependency_multiple_owners.py b/test/shed_functional/functional/test_1140_simple_repository_dependency_multiple_owners.py index 7757a7215be..d4966942332 100644 --- a/test/shed_functional/functional/test_1140_simple_repository_dependency_multiple_owners.py +++ b/test/shed_functional/functional/test_1140_simple_repository_dependency_multiple_owners.py @@ -182,7 +182,9 @@ class TestInstallRepositoryMultipleOwners( ShedTwillTestCase ): datatypes_repository = self.test_db_util.get_installed_repository_by_name_owner( datatypes_repository_name, common.test_user_2_name ) current_datatypes = int( self.get_datatypes_count() ) expected_count = base_datatypes_count + repository_datatypes_count - assert current_datatypes == expected_count, 'Installing %s did not add new datatypes. Expected: %d. Found: %d' % \ + # Once the BLAST datatypes have been included in Galaxy itself, the count won't change + assert current_datatypes == base_datatypes_count or current_datatypes == expected_count, \ + 'Installing %s did not add new datatypes. Expected: %d. Found: %d' % \ ( 'blastxml_to_top_descr_0120', expected_count, current_datatypes ) strings_displayed = [ 'Installed repository dependencies', 'user1', 'blast_datatypes_0120' ] strings_displayed.extend( [ 'Valid tools', 'BLAST top hit', 'Make a table', datatypes_repository.installed_changeset_revision ] )