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

Move more galaxy config logic into driver_util.

Browse Source 
This time for galaxy master API key.
This commit is contained in:
John Chilton
2016-03-29 08:04:26 -04:00
parent 65806641c1
commit 5b826a0839
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/functional_tests.py
+3 -6
View File
@@ -71,8 +71,6 @@ def main():
# 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 )
galaxy_data_manager_data_path = tempfile.mkdtemp( prefix='data_manager_tool-data', dir=data_manager_test_tmp_path )
master_api_key = get_master_api_key()
app = None
server_wrapper = None
@@ -82,7 +80,6 @@ def main():
tool_config_file=tool_config_file,
galaxy_data_manager_data_path=galaxy_data_manager_data_path,
update_integrated_tool_panel=False,
master_api_key=master_api_key,
cleanup_job='onsuccess',
enable_beta_tool_formats=True,
auto_configure_logging=logging_config_file is None,
@@ -113,7 +110,7 @@ def main():
if workflow_test:
import functional.workflow
functional.workflow.WorkflowTestCase.workflow_test_file = workflow_test
functional.workflow.WorkflowTestCase.master_api_key = master_api_key
functional.workflow.WorkflowTestCase.master_api_key = get_master_api_key()
functional.workflow.WorkflowTestCase.user_api_key = get_user_api_key()
data_manager_test = _check_arg( '-data_managers', param=False )
if data_manager_test:
@@ -122,7 +119,7 @@ def main():
functional.test_data_managers.build_tests(
tmp_dir=data_manager_test_tmp_path,
testing_shed_tools=testing_shed_tools,
master_api_key=master_api_key,
master_api_key=get_master_api_key(),
user_api_key=get_user_api_key(),
)
@@ -136,7 +133,7 @@ def main():
functional.test_toolbox.build_tests(
app=app,
testing_shed_tools=testing_shed_tools,
master_api_key=master_api_key,
master_api_key=get_master_api_key(),
user_api_key=get_user_api_key(),
)
success = driver_util.nose_config_and_run()
test/base/driver_util.py
+3
View File
@@ -22,6 +22,7 @@ import nose.plugins.manager
from paste import httpserver
from .api_util import get_master_api_key
from .tool_shed_util import parse_tool_panel_config
from .nose_util import run
from .instrument import StructuredTestDataPlugin
@@ -113,6 +114,7 @@ def setup_galaxy_config(
if tool_dependency_dir is None:
tool_dependency_dir = tempfile.mkdtemp(dir=tmpdir, prefix="tool_dependencies")
tool_data_table_config_path = _tool_data_table_config_path(default_tool_data_table_config_path)
master_api_key = get_master_api_key()
config = dict(
admin_users='test@bx.psu.edu',
allow_library_path_paste=True,
@@ -127,6 +129,7 @@ def setup_galaxy_config(
library_import_dir=library_import_dir,
log_destination="stdout",
new_file_path=new_file_path,
master_api_key=master_api_key,
running_functional_tests=True,
template_cache_path=template_cache_path,
template_path='templates',