details: http://www.bx.psu.edu/hg/galaxy/rev/841037edd8a0 changeset: 3438:841037edd8a0 user: Nate Coraor nate@bx.psu.edu date: Wed Feb 24 15:54:52 2010 -0500 description: Fix for set metadata tests when setting metadata externally
diffstat:
scripts/functional_tests.py | 5 +++-- test/base/twilltestcase.py | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-)
diffs (35 lines):
diff -r aece26463c9d -r 841037edd8a0 scripts/functional_tests.py --- a/scripts/functional_tests.py Wed Feb 24 11:57:35 2010 -0500 +++ b/scripts/functional_tests.py Wed Feb 24 15:54:52 2010 -0500 @@ -109,11 +109,12 @@ database_connection = os.environ['GALAXY_TEST_DBURI'] else: database_connection = 'sqlite:///' + os.path.join( db_path, 'universe.sqlite' ) + kwargs = {} + for dir in file_path, new_file_path: try: - os.makedirs( file_path ) + os.makedirs( dir ) except OSError: pass - kwargs = {}
print "Database connection:", database_connection
diff -r aece26463c9d -r 841037edd8a0 test/base/twilltestcase.py --- a/test/base/twilltestcase.py Wed Feb 24 11:57:35 2010 -0500 +++ b/test/base/twilltestcase.py Wed Feb 24 15:54:52 2010 -0500 @@ -475,7 +475,12 @@ self.check_page_for_string( 'This will inspect the dataset and attempt' ) tc.fv( 'auto_detect', 'id', hda_id ) tc.submit( 'detect' ) - self.check_page_for_string( 'Attributes updated' ) + try: + self.check_page_for_string( 'Attributes have been queued to be updated' ) + self.wait() + except AssertionError: + self.check_page_for_string( 'Attributes updated' ) + #self.check_page_for_string( 'Attributes updated' ) self.home() def convert_format( self, hda_id, target_type ): """Convert format of history_dataset_association"""