opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Further unification of how to setup Galaxy databases for testing.

Browse Source 
Reuse setup_galaxy_config for this task.
This commit is contained in:
John Chilton
2016-03-29 08:04:24 -04:00
parent fe460008fa
commit 2729699bf6
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/functional_tests.py
+1 -5
View File
@@ -117,11 +117,9 @@ def main():
galaxy_config = driver_util.setup_galaxy_config(
galaxy_db_path,
use_test_file_dir=not testing_shed_tools,
default_install_db_merged=True,
)
database_conf = driver_util.database_conf(galaxy_db_path)
install_database_conf = driver_util.install_database_conf(galaxy_db_path, default_merged=True)
# Data Manager testing temp path
# For storing Data Manager outputs and .loc files so that real ones don't get clobbered
data_manager_test_tmp_path = tempfile.mkdtemp( prefix='data_manager_test_tmp', dir=galaxy_test_tmp_dir )
@@ -143,8 +141,6 @@ def main():
auto_configure_logging=logging_config_file is None,
data_manager_config_file=data_manager_config_file )
kwargs.update(galaxy_config)
kwargs.update(database_conf)
kwargs.update(install_database_conf)
if datatypes_conf_override:
kwargs[ 'datatypes_config_file' ] = datatypes_conf_override
# If the user has passed in a path for the .ini file, do not overwrite it.