details: http://www.bx.psu.edu/hg/galaxy/rev/4a416d872806 changeset: 3410:4a416d872806 user: Greg Von Kuster <greg@bx.psu.edu> date: Wed Feb 17 16:37:02 2010 -0500 description: Fix bug introduced in change set 3408:6471c9b8149c when testing form fields with labels / values longer than 30 chars. diffstat: test/base/twilltestcase.py | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diffs (26 lines): diff -r a8b176655f0b -r 4a416d872806 test/base/twilltestcase.py --- a/test/base/twilltestcase.py Wed Feb 17 15:50:38 2010 -0500 +++ b/test/base/twilltestcase.py Wed Feb 17 16:37:02 2010 -0500 @@ -882,13 +882,15 @@ control.get( name=elem ).selected = True else: # control.is_of_kind( "singlelist" ) for elem in control_value: - # Galaxy truncates long file names in the dataset_collector in ~/parameters/basic.py - if len( elem ) > 30: - elem_name = '%s..%s' % ( elem[:17], elem[-11:] ) - else: - elem_name = elem - - tc.fv( f.name, control.name, str( elem_name ) ) + try: + tc.fv( f.name, control.name, str( elem ) ) + except Exception, e2: + # Galaxy truncates long file names in the dataset_collector in ~/parameters/basic.py + if len( elem ) > 30: + elem_name = '%s..%s' % ( elem[:17], elem[-11:] ) + else: + elem_name = elem + tc.fv( f.name, control.name, str( elem_name ) ) except Exception, exc: errmsg = "Attempting to set field '%s' to value '%s' in form '%s' threw exception: %s\n" % ( control_name, str( control_value ), f.name, str( exc ) ) errmsg += "control: %s\n" % str( control )