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

De-duplicate test driver - move more Galaxy config into common method.

Browse Source
This commit is contained in:
John Chilton
2016-03-29 08:04:22 -04:00
parent e86fa83e86
commit a18cbd5930
3 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/functional_tests.py
+1 -12
View File
@@ -173,22 +173,15 @@ def main():
master_api_key = get_master_api_key()
app = None
if start_server:
kwargs = dict( admin_users='test@bx.psu.edu',
api_allow_run_as='test@bx.psu.edu',
allow_library_path_paste=True,
allow_user_creation=True,
allow_user_deletion=True,
database_connection=database_connection,
kwargs = dict( database_connection=database_connection,
database_auto_migrate=database_auto_migrate,
datatype_converters_config_file="datatype_converters_conf.xml.sample",
file_path=file_path,
id_secret='changethisinproductiontoo',
job_queue_workers=5,
job_working_directory=job_working_directory,
log_destination="stdout",
new_file_path=new_file_path,
template_cache_path=template_cache_path,
running_functional_tests=True,
shed_tool_data_table_config=shed_tool_data_table_config,
template_path="templates",
test_conf="test.conf",
@@ -196,12 +189,8 @@ def main():
tool_data_table_config_path=tool_data_table_config_path,
tool_path=tool_path,
galaxy_data_manager_data_path=galaxy_data_manager_data_path,
tool_parse_help=False,
update_integrated_tool_panel=False,
use_heartbeat=False,
master_api_key=master_api_key,
use_tasked_jobs=True,
check_migrate_tools=False,
cleanup_job='onsuccess',
enable_beta_tool_formats=True,
auto_configure_logging=logging_config_file is None,
test/base/driver_util.py
+15
View File
@@ -84,7 +84,22 @@ def setup_galaxy_config(use_test_file_dir=False):
user_library_import_dir = None
library_import_dir = None
return dict(
admin_users='test@bx.psu.edu',
allow_library_path_paste=True,
allow_user_creation=True,
allow_user_deletion=True,
api_allow_run_as='test@bx.psu.edu',
check_migrate_tools=False,
id_secret='changethisinproductiontoo',
job_queue_workers=5,
library_import_dir=library_import_dir,
log_destination="stdout",
running_functional_tests=True,
template_path='templates',
tool_parse_help=False,
update_integrated_tool_panel=False,
use_tasked_jobs=True,
use_heartbeat=False,
user_library_import_dir=user_library_import_dir,
)
test/tool_shed/functional_tests.py
+2 -15
View File
@@ -184,36 +184,23 @@ def main():
galaxy_global_conf = driver_util.get_webapp_global_conf()
galaxy_global_conf[ '__file__' ] = 'config/galaxy.ini.sample'
kwargs = dict( allow_user_creation=True,
allow_user_deletion=True,
admin_users='test@bx.psu.edu',
allow_library_path_paste=True,
database_connection=galaxy_database_connection,
kwargs = dict( database_connection=galaxy_database_connection,
database_auto_migrate=galaxy_database_auto_migrate,
datatype_converters_config_file="datatype_converters_conf.xml.sample",
check_migrate_tools=False,
enable_tool_shed_check=True,
file_path=galaxy_file_path,
global_conf=galaxy_global_conf,
hours_between_check=0.001,
id_secret='changethisinproductiontoo',
job_queue_workers=5,
log_destination="stdout",
migrated_tools_config=galaxy_migrated_tool_conf_file,
new_file_path=galaxy_tempfiles,
running_functional_tests=True,
shed_data_manager_config_file=galaxy_shed_data_manager_conf_file,
shed_tool_data_table_config=shed_tool_data_table_conf_file,
shed_tool_path=galaxy_shed_tool_path,
template_path="templates",
tool_data_path=tool_data_path,
tool_dependency_dir=galaxy_tool_dependency_dir,
tool_config_file=[ galaxy_tool_conf_file, galaxy_shed_tool_conf_file ],
tool_sheds_config_file=galaxy_tool_sheds_conf_file,
tool_parse_help=False,
tool_data_table_config_path=galaxy_tool_data_table_conf_file,
update_integrated_tool_panel=False,
use_heartbeat=False )
tool_data_table_config_path=galaxy_tool_data_table_conf_file )
kwargs.setup_galaxy_config(use_test_file_dir=False)
kwargs.update(install_database_conf)
# ---- Build Galaxy Application --------------------------------------------------