opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix display of job stdio when using the twill interactor.

Browse Source
This commit is contained in:
Dave Bouvier
2014-07-15 16:30:35 -04:00
parent 0fd3b0743c
commit 2e893a17eb
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/base/interactor.py
+2 -1
View File
@@ -386,7 +386,8 @@ class GalaxyInteractorTwill( object ):
self.twill_test_case.verify_dataset_correctness( outfile, hid=hid, attributes=attributes, shed_tool_id=shed_tool_id, maxseconds=maxseconds )
def get_job_stream( self, history_id, output_data, stream ):
return self.twill_test_case._get_job_stream_output( output_data.get( 'id' ), stream=stream, format=False )
data_id = self.twill_test_case.security.encode_id( output_data.get( 'id' ) )
return self.twill_test_case._get_job_stream_output( data_id, stream=stream, format=False )
def stage_data_async( self, test_data, history, shed_tool_id, async=True ):
name = test_data.get( 'name', None )
test/base/twilltestcase.py
+1 -1
View File
@@ -2496,7 +2496,7 @@ class TwillTestCase( unittest.TestCase ):
return msg
def _get_job_stream_output( self, hda_id, stream, format ):
self.visit_url( "/datasets/%s/%s" % ( self.security.encode_id( hda_id ), stream ) )
self.visit_url( "/datasets/%s/%s" % ( hda_id, stream ) )
output = self.last_page()
return self._format_stream( output, stream, format )