1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/243ff2bfbf28/ changeset: 243ff2bfbf28 user: inithello date: 2012-11-16 21:39:50 summary: Fix for TwillTestCase.wait() with the new client-side histories. affected #: 1 file diff -r 8bd9f729fb6a92077b9652690b11877f203902ec -r 243ff2bfbf28fb92f94eca408d063fb5257a6481 test/base/twilltestcase.py --- a/test/base/twilltestcase.py +++ b/test/base/twilltestcase.py @@ -1199,15 +1199,25 @@ tc.fv( 2, "hgta_doGalaxyQuery", "Send query to Galaxy" ) self.submit_form( button="Send query to Galaxy" )#, **output_params ) #AssertionError: Attempting to set field 'fbQual' to value '['whole']' in form 'None' threw exception: no matching forms! control: <RadioControl(fbQual=[whole, upstreamAll, endAll])> + def get_running_datasets( self ): + self.visit_url( '/api/histories' ) + history_id = from_json_string( self.last_page() )[0][ 'id' ] + self.visit_url( '/api/histories/%s/contents' % history_id ) + jsondata = from_json_string( self.last_page() ) + for history_item in jsondata: + self.visit_url( history_item[ 'url' ] ) + item_json = from_json_string( self.last_page() ) + if item_json[ 'state' ] in [ 'queued', 'running', 'paused' ]: + return True + return False + def wait( self, maxseconds=120 ): """Waits for the tools to finish""" sleep_amount = 0.1 slept = 0 self.home() while slept <= maxseconds: - self.visit_page( "history" ) - page = tc.browser.get_html() - if page.find( '<!-- running: do not change this comment, used by TwillTestCase.wait -->' ) > -1: + if self.get_running_datasets(): time.sleep( sleep_amount ) slept += sleep_amount sleep_amount *= 2 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.