1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/aff21e09778e/ Changeset: aff21e09778e User: carlfeberhard Date: 2014-06-24 23:02:23 Summary: Fix: phantomjs apparently lacks the bind fn on the Function prototype - correct failures in history-panel (line 252) by using underscore bind instead; up the standard upload timeout interval for api tests Affected #: 2 files

diff -r ae31e175f1cd836e89324a57d2c4276c5091f95f -r aff21e09778ece1bdbe987a4dad2adb6a26e5447 static/scripts/mvc/history/history-panel.js --- a/static/scripts/mvc/history/history-panel.js +++ b/static/scripts/mvc/history/history-panel.js @@ -249,7 +249,7 @@ actions.push( { // TODO: Only show quick pair if two things selected. html: _l( 'Build List of Dataset Pairs (Experimental)' ), - func: panel._showPairedCollectionModal.bind( panel ) + func: _.bind( panel._showPairedCollectionModal, panel ) }); return new PopupMenu( $where.find( '.history-dataset-action-popup-btn' ), actions ); },

diff -r ae31e175f1cd836e89324a57d2c4276c5091f95f -r aff21e09778ece1bdbe987a4dad2adb6a26e5447 test/casperjs/modules/api.js --- a/test/casperjs/modules/api.js +++ b/test/casperjs/modules/api.js @@ -555,7 +555,7 @@ };

/** amount of time allowed to upload a file (before erroring) */ -ToolsAPI.prototype.DEFAULT_UPLOAD_TIMEOUT = 12000; +ToolsAPI.prototype.DEFAULT_UPLOAD_TIMEOUT = 30 * 1000;

/** add two casperjs steps - upload a file, wait for the job to complete, and run 'then' when they are */ ToolsAPI.prototype.thenUpload = function thenUpload( historyId, options, then ){ @@ -569,6 +569,9 @@ this.debug( 'uploadedId: ' + uploadedId ); });

+ spaceghost.debug( '---------------------------------------------------------- timeout: ' + ( options.timeout || spaceghost.api.tools.DEFAULT_UPLOAD_TIMEOUT ) ); + spaceghost.debug( 'timeout: ' + options.timeout ); + spaceghost.debug( 'timeout: ' + spaceghost.api.tools.DEFAULT_UPLOAD_TIMEOUT ); spaceghost.then( function(){ this.waitFor( function testHdaState(){

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.