From 2e893a17ebc9c39d37a518b5e413e877bb8b9dfa Mon Sep 17 00:00:00 2001 From: Dave Bouvier Date: Tue, 15 Jul 2014 16:30:35 -0400 Subject: [PATCH] Fix display of job stdio when using the twill interactor. --- test/base/interactor.py | 3 ++- test/base/twilltestcase.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/base/interactor.py b/test/base/interactor.py index 277e9c8c49a..3437fd43a31 100644 --- a/test/base/interactor.py +++ b/test/base/interactor.py @@ -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 ) diff --git a/test/base/twilltestcase.py b/test/base/twilltestcase.py index 529922aaa00..121a6cb7e9e 100644 --- a/test/base/twilltestcase.py +++ b/test/base/twilltestcase.py @@ -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 )