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

Assign values from env using new utility function

Browse Source 
Also, fix error: don't break out early as both values should be
assigned.
This commit is contained in:
John Davis
2022-10-13 13:17:33 -04:00
parent 4818c8dadf
commit c8a1581e06
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy_test/base/api.py
+3 -9
View File
@@ -14,6 +14,7 @@ from urllib.parse import (
import pytest
import requests
from galaxy.util.properties import get_from_env
from .api_asserts import (
assert_error_code_is,
assert_has_keys,
@@ -31,15 +32,8 @@ from .api_util import (
from .interactor import TestCaseGalaxyInteractor as BaseInteractor
CONFIG_PREFIXES = ["GALAXY_TEST_CONFIG_", "GALAXY_CONFIG_OVERRIDE_", "GALAXY_CONFIG_"]
DEFAULT_CELERY_BROKER = "memory://"
DEFAULT_CELERY_BACKEND = "rpc://localhost"
for prefix in CONFIG_PREFIXES:
CELERY_BROKER = os.environ.get(f"{prefix}CELERY_BROKER", DEFAULT_CELERY_BROKER)
if CELERY_BROKER != DEFAULT_CELERY_BROKER:
break
CELERY_BACKEND = os.environ.get(f"{prefix}CELERY_BACKEND", DEFAULT_CELERY_BACKEND)
if CELERY_BACKEND != DEFAULT_CELERY_BACKEND:
break
CELERY_BROKER = get_from_env("CELERY_BROKER", CONFIG_PREFIXES, "memory://")
CELERY_BACKEND = get_from_env("CELERY_BACKEND", CONFIG_PREFIXES, "rpc://localhost")
@pytest.fixture(scope="session")