commit/galaxy-central: dan: Allow ftp for GALAXY_TEST_DB_TEMPLATE and stricter check for protocol URL prefixes.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/9202b520908d/ Changeset: 9202b520908d User: dan Date: 2013-12-10 17:08:13 Summary: Allow ftp for GALAXY_TEST_DB_TEMPLATE and stricter check for protocol URL prefixes. Affected #: 1 file diff -r 738839e77188c2f42d956998f38daea619f3c35e -r 9202b520908dd37a25fce0cf53b585df10b6b59e scripts/functional_tests.py --- a/scripts/functional_tests.py +++ b/scripts/functional_tests.py @@ -182,7 +182,7 @@ if os.path.exists( source ): shutil.copy( source, db_path ) assert os.path.exists( db_path ) - elif source.lower().startswith( "http" ): + elif source.lower().startswith( ( "http://", "https://", "ftp://" ) ): urllib.urlretrieve( source, db_path ) else: raise Exception( "Failed to copy database template from source %s" % source ) @@ -323,6 +323,7 @@ # GALAXY_TEST_DBURI. The former requires a lot of setup # time, the latter results in test failures in certain # cases (namely tool shed tests expecting clean database). + log.debug( "Copying database template from %s.", os.environ['GALAXY_TEST_DB_TEMPLATE'] ) __copy_database_template(os.environ['GALAXY_TEST_DB_TEMPLATE'], db_path) database_auto_migrate = True database_connection = 'sqlite:///%s' % db_path Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
commits-noreply@bitbucket.org