From 7a87e6c6db0ea3b59320ea360d9fb51646216861 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Fri, 18 Feb 2011 16:21:11 -0500 Subject: [PATCH] Fix for 3 of the 4 failing upload tests. --- test/functional/test_get_data.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/functional/test_get_data.py b/test/functional/test_get_data.py index 82cc3949dde..024bb919fc1 100644 --- a/test/functional/test_get_data.py +++ b/test/functional/test_get_data.py @@ -228,7 +228,7 @@ class UploadData( TwillTestCase ): hda = get_latest_hda() assert hda is not None, "Problem retrieving hda from database" self.verify_dataset_correctness( 'qualscores.qualsolid', hid=str( hda.hid ) ) - self.check_history_for_string( '48 lines, format: qualsolid, database: \? Info: uploaded file' ) + self.check_history_for_string( '48 lines format: qualsolid, database: \? Info: uploaded file' ) self.check_metadata_for_string( 'Change data type value="qualsolid" selected="yes">qualsolid' ) self.delete_history( id=self.security.encode_id( history.id ) ) def test_0090_upload_file( self ): @@ -240,7 +240,7 @@ class UploadData( TwillTestCase ): hda = get_latest_hda() assert hda is not None, "Problem retrieving hda from database" self.verify_dataset_correctness( 'qualscores.qual454', hid=str( hda.hid ) ) - self.check_history_for_string( '49 lines, format: qual454, database: \?' ) + self.check_history_for_string( '49 lines format: qual454, database: \?' ) self.check_metadata_for_string( 'Change data type value="qual454" selected="yes">qual454' ) self.delete_history( id=self.security.encode_id( history.id ) ) def test_0095_upload_file( self ): @@ -357,7 +357,7 @@ class UploadData( TwillTestCase ): hda = get_latest_hda() assert hda is not None, "Problem retrieving hda from database" self.verify_dataset_correctness( 'shrimp_cs_test1.csfasta', hid=str( hda.hid ) ) - self.check_history_for_string( '2,500 sequences, format: csfasta, >2_14_26_F3,-1282216.0' ) + self.check_history_for_string( '2,500 sequences format: csfasta, >2_14_26_F3,-1282216.0' ) self.check_metadata_for_string( 'value="shrimp_cs_test1.csfasta" value="\?" Change data type value="csfasta" selected="yes"' ) self.delete_history( id=self.security.encode_id( history.id ) ) def test_0140_upload_file( self ):