details: http://www.bx.psu.edu/hg/galaxy/rev/4f923033e9d0 changeset: 3004:4f923033e9d0 user: Nate Coraor <nate@bx.psu.edu> date: Tue Nov 10 15:10:43 2009 -0500 description: Add test for library tarball downloads diffstat: test/base/twilltestcase.py | 60 ++++++++++++++++++++++++++++- test/functional/test_security_and_libraries.py | 9 ++++ 2 files changed, 66 insertions(+), 3 deletions(-) diffs (110 lines): diff -r d5fd27771019 -r 4f923033e9d0 test/base/twilltestcase.py --- a/test/base/twilltestcase.py Tue Nov 10 15:04:03 2009 -0500 +++ b/test/base/twilltestcase.py Tue Nov 10 15:10:43 2009 -0500 @@ -1,7 +1,7 @@ import pkg_resources pkg_resources.require( "twill==0.9" ) -import StringIO, os, sys, random, filecmp, time, unittest, urllib, logging, difflib, zipfile, tempfile, re +import StringIO, os, sys, random, filecmp, time, unittest, urllib, logging, difflib, tarfile, zipfile, tempfile, re, shutil from itertools import * import twill @@ -736,8 +736,8 @@ errmsg = "no match to '%s'\npage content written to '%s'" % ( patt, fname ) raise AssertionError( errmsg ) - def write_temp_file( self, content ): - fd, fname = tempfile.mkstemp( suffix='.html', prefix='twilltestcase-' ) + def write_temp_file( self, content, suffix='.html' ): + fd, fname = tempfile.mkstemp( suffix=suffix, prefix='twilltestcase-' ) f = os.fdopen( fd, "w" ) f.write( content ) f.close() @@ -1616,6 +1616,60 @@ self.check_page_for_string( check_str_after_submit ) self.library_wait( library_id, controller='library' ) self.home() + def download_archive_of_library_files( self, library_id, ldda_ids, format ): + self.home() + self.visit_url( "%s/library/browse_library?obj_id=%s" % ( self.url, library_id ) ) + for ldda_id in ldda_ids: + tc.fv( "1", "ldda_ids", ldda_id ) + tc.fv( "1", "do_action", format ) + tc.submit( "action_on_datasets_button" ) + tc.code( 200 ) + archive = self.write_temp_file( self.last_page(), suffix=format ) + self.home() + return archive + def check_archive_contents( self, archive, lddas ): + def get_ldda_path( ldda ): + path = "" + parent_folder = ldda.library_dataset.folder + while parent_folder is not None: + if parent_folder.parent is None: + path = os.path.join( parent_folder.library_root[0].name, path ) + break + path = os.path.join( parent_folder.name, path ) + parent_folder = parent_folder.parent + path += ldda.name + return path + def mkdir( file ): + dir = os.path.join( tmpd, os.path.dirname( file ) ) + if not os.path.exists( dir ): + os.makedirs( dir ) + tmpd = tempfile.mkdtemp() + if tarfile.is_tarfile( archive ): + t = tarfile.open( archive ) + for n in t.getnames(): + mkdir( n ) + t.extract( n, tmpd ) + t.close() + elif zipfile.is_zipfile( archive ): + z = zipfile.open( archive ) + for n in z.namelist(): + mkdir( n ) + open( os.path.join( tmpd, n ), 'wb' ).write( z.read( n ) ) + z.close() + else: + raise Exception( 'Unable to read archive: %s' % archive ) + for ldda in lddas: + orig_file = self.get_filename( ldda.name ) + downloaded_file = os.path.join( tmpd, get_ldda_path( ldda ) ) + assert os.path.exists( downloaded_file ) + try: + self.files_diff( orig_file, downloaded_file ) + except AssertionError, err: + errmsg = 'Library item %s different than expected, difference:\n' % ldda.name + errmsg += str( err ) + errmsg += 'Unpacked archive remains in: %s\n' % tmpd + raise AssertionError( errmsg ) + shutil.rmtree( tmpd ) def delete_library_item( self, library_id, library_item_id, library_item_name, library_item_type='library_dataset' ): """Mark a library item as deleted""" self.home() diff -r d5fd27771019 -r 4f923033e9d0 test/functional/test_security_and_libraries.py --- a/test/functional/test_security_and_libraries.py Tue Nov 10 15:04:03 2009 -0500 +++ b/test/functional/test_security_and_libraries.py Tue Nov 10 15:10:43 2009 -0500 @@ -6,6 +6,7 @@ not_logged_in_security_msg = 'You must be logged in as an administrator to access this feature.' logged_in_security_msg = 'You must be an administrator to access this feature.' +import sys class TestSecurityAndLibraries( TwillTestCase ): def test_000_admin_features_when_not_logged_in( self ): """Testing admin_features when not logged in""" @@ -1385,6 +1386,14 @@ self.home() self.logout() self.login( email=admin_user.email ) + def test_167_download_archive_of_library_files( self ): + """Testing downloading an archive of files from the library""" + for format in ( 'tbz', 'tgz', 'zip' ): + archive = self.download_archive_of_library_files( str( library_one.id ), + ( str( ldda_one.id ), str( ldda_two.id ) ), + format ) + self.check_archive_contents( archive, ( ldda_one, ldda_two ) ) + os.remove( archive ) def test_170_mark_group_deleted( self ): """Testing marking a group as deleted""" # Logged in as admin_user