tests: fix httpbin port, within a container we use internal docker network so port is not exposed, we should call httpbin directly
This commit is contained in:
parent
4b9bf78fc5
commit
2f6649d083
3 changed files with 7 additions and 5 deletions
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue