From 575d2d2ffb6c876fe8794de00026fb0eee5e80d5 Mon Sep 17 00:00:00 2001 From: James Taylor Date: Tue, 30 Oct 2007 07:04:46 +0000 Subject: [PATCH] Test fixes. --- lib/galaxy/tools/parameters.py | 2 +- test/base/twilltestcase.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/tools/parameters.py b/lib/galaxy/tools/parameters.py index f6f808cb9fd..a15019a020b 100644 --- a/lib/galaxy/tools/parameters.py +++ b/lib/galaxy/tools/parameters.py @@ -493,7 +493,7 @@ class SelectToolParameter( ToolParameter ): if self.is_dynamic and trans.workflow_building_mode: # Really the best we can do? return None - options = self.get_options( trans, context ) + options = list( self.get_options( trans, context ) ) value = [ optval for _, optval, selected in options if selected ] if len( value ) == 0: if not self.multiple and options: diff --git a/test/base/twilltestcase.py b/test/base/twilltestcase.py index b10f8ca9007..1854b3d3d85 100644 --- a/test/base/twilltestcase.py +++ b/test/base/twilltestcase.py @@ -360,7 +360,7 @@ class TwillTestCase( unittest.TestCase ): #Check for onchange attribute, submit a change if required for i, control in enumerate(tc.showforms()[form-1].controls): try: - if 'onchange' in control.attrs.keys(): + if 'refresh_on_change' in control.attrs.keys(): changed = False for elem in kwd[control.name]: """ @@ -370,7 +370,7 @@ class TwillTestCase( unittest.TestCase ): param_text = '' for param in tc.show().split('')[0] + 'select>').replace('selected', 'selected="yes"') - if param.find('onchang') != -1 and param.find('name="%s"' % control.name) != -1: + if param.find('on_chang') != -1 and param.find('name="%s"' % control.name) != -1: tree = ElementTree.fromstring(param) for option in tree.findall('option') : if option.get('value') in control.value: