1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/64d51b16a551/ Changeset: 64d51b16a551 User: davebgx Date: 2014-07-09 22:11:50 Summary: Fix test_history_functions test 80, copying history items. Affected #: 2 files diff -r 50a273de6cd76b770eb78861fee2b0a97621fa3b -r 64d51b16a55173bfec78dc22ee802d3e085dd4fc test/base/twilltestcase.py --- a/test/base/twilltestcase.py +++ b/test/base/twilltestcase.py @@ -506,13 +506,13 @@ self.check_page_for_string( 'The file conversion of Convert BED to GFF on data' ) self.wait() # wait for the format convert tool to finish before returning - def copy_history_item( self, source_dataset_id=None, target_history_id=None, all_target_history_ids=[], + def copy_history_item( self, source_history_id=None, source_dataset_id=None, target_history_id=None, all_target_history_ids=[], deleted_history_ids=[] ): """ Copy 1 history_dataset_association to 1 history (Limited by twill since it doesn't support multiple field names, such as checkboxes """ - self.visit_url( "%s/dataset/copy_datasets?source_dataset_ids=%s" % ( self.url, source_dataset_id ) ) + self.visit_url( "/dataset/copy_datasets" ) self.check_page_for_string( 'Source History:' ) # Make sure all of users active histories are displayed for id in all_target_history_ids: @@ -524,9 +524,11 @@ raise AssertionError( "deleted history id %d displayed in list of target histories" % id ) except: pass - - tc.fv( '1', 'target_history_id', target_history_id ) - tc.submit( 'do_copy' ) + form_values = [ ( 'source_history', source_history_id ), + ( 'target_history_id', target_history_id ), + ( 'source_content_ids', 'dataset|%s' % source_dataset_id ), + ( 'do_copy', True ) ] + self.visit_url( "/dataset/copy_datasets", params=form_values ) check_str = '1 dataset copied to 1 history' self.check_page_for_string( check_str ) diff -r 50a273de6cd76b770eb78861fee2b0a97621fa3b -r 64d51b16a55173bfec78dc22ee802d3e085dd4fc test/functional/test_history_functions.py --- a/test/functional/test_history_functions.py +++ b/test/functional/test_history_functions.py @@ -831,7 +831,8 @@ deleted_history_ids = [ self.security.encode_id( history1.id ), self.security.encode_id( history2.id ) ] # Test copying to the current history target_history_id = self.security.encode_id( history6.id ) - self.copy_history_item( source_dataset_id=source_dataset_ids, + self.copy_history_item( source_history_id=self.security.encode_id( history6.id ), + source_dataset_id=source_dataset_ids, target_history_id=target_history_id, all_target_history_ids=all_target_history_ids, deleted_history_ids=deleted_history_ids ) @@ -852,7 +853,8 @@ all_target_history_ids = [ self.security.encode_id( hda.id ) for hda in admin_user.active_histories ] # Test copying to the a history that is not the current history self.security.encode_id( history7.id ) - self.copy_history_item( source_dataset_id=source_dataset_ids, + self.copy_history_item( source_history_id=self.security.encode_id( history6.id ), + source_dataset_id=source_dataset_ids, target_history_id=target_history_id, all_target_history_ids=all_target_history_ids, deleted_history_ids=deleted_history_ids ) 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.