diff --git a/rhodecode/tests/conftest.py b/rhodecode/tests/conftest.py index 0c56d595..3e4aed3a 100644 --- a/rhodecode/tests/conftest.py +++ b/rhodecode/tests/conftest.py @@ -37,6 +37,10 @@ from rhodecode.model.user import UserModel log = logging.getLogger(__name__) +# Docker image running httpbin... +HTTPBIN_DOMAIN = 'http://httpbin' +HTTPBIN_POST = HTTPBIN_DOMAIN + '/post' + @pytest.fixture() def enable_auth_plugins(request, baseapp, csrf_token): diff --git a/rhodecode/tests/integrations/conftest.py b/rhodecode/tests/integrations/conftest.py index 4b4b8fc9..fc880bfd 100644 --- a/rhodecode/tests/integrations/conftest.py +++ b/rhodecode/tests/integrations/conftest.py @@ -21,6 +21,7 @@ import pytest from rhodecode import events from rhodecode.lib.utils2 import AttributeDict +from rhodecode.tests.conftest import HTTPBIN_DOMAIN @pytest.fixture() @@ -47,7 +48,7 @@ def repo_push_event(backend, user_regular): 'scm': alias, 'config': '', 'repo_store': '', - 'server_url': 'http://httpbin:9090', + 'server_url': HTTPBIN_DOMAIN, 'make_lock': None, 'locked_by': [None], 'commit_ids': commit_ids, diff --git a/rhodecode/tests/vcs_operations/conftest.py b/rhodecode/tests/vcs_operations/conftest.py index 68966002..21bc6495 100644 --- a/rhodecode/tests/vcs_operations/conftest.py +++ b/rhodecode/tests/vcs_operations/conftest.py @@ -43,6 +43,7 @@ from rhodecode.model.meta import Session from rhodecode.integrations.types.webhook import WebhookIntegrationType from rhodecode.tests import GIT_REPO, HG_REPO +from rhodecode.tests.conftest import HTTPBIN_DOMAIN from rhodecode.tests.fixture import Fixture from rhodecode.tests.server_utils import RcWebServer @@ -53,10 +54,6 @@ GIT_REPO_WITH_GROUP = f'{REPO_GROUP}/{GIT_REPO}' log = logging.getLogger(__name__) -# Docker image running httpbin... -HTTPBIN_DOMAIN = 'http://httpbin:9090' -HTTPBIN_POST = HTTPBIN_DOMAIN + '/post' - def check_httpbin_connection(): try: