##// END OF EJS Templates
tests: fix httpbin port, within a container we use internal docker network so port is not exposed, we should call httpbin directly
super-admin -
r5153:57de8b95 default
parent child Browse files
Show More
@@ -37,6 +37,10 b' from rhodecode.model.user import UserMod'
37
37
38 log = logging.getLogger(__name__)
38 log = logging.getLogger(__name__)
39
39
40 # Docker image running httpbin...
41 HTTPBIN_DOMAIN = 'http://httpbin'
42 HTTPBIN_POST = HTTPBIN_DOMAIN + '/post'
43
40
44
41 @pytest.fixture()
45 @pytest.fixture()
42 def enable_auth_plugins(request, baseapp, csrf_token):
46 def enable_auth_plugins(request, baseapp, csrf_token):
@@ -21,6 +21,7 b''
21 import pytest
21 import pytest
22 from rhodecode import events
22 from rhodecode import events
23 from rhodecode.lib.utils2 import AttributeDict
23 from rhodecode.lib.utils2 import AttributeDict
24 from rhodecode.tests.conftest import HTTPBIN_DOMAIN
24
25
25
26
26 @pytest.fixture()
27 @pytest.fixture()
@@ -47,7 +48,7 b' def repo_push_event(backend, user_regula'
47 'scm': alias,
48 'scm': alias,
48 'config': '',
49 'config': '',
49 'repo_store': '',
50 'repo_store': '',
50 'server_url': 'http://httpbin:9090',
51 'server_url': HTTPBIN_DOMAIN,
51 'make_lock': None,
52 'make_lock': None,
52 'locked_by': [None],
53 'locked_by': [None],
53 'commit_ids': commit_ids,
54 'commit_ids': commit_ids,
@@ -43,6 +43,7 b' from rhodecode.model.meta import Session'
43 from rhodecode.integrations.types.webhook import WebhookIntegrationType
43 from rhodecode.integrations.types.webhook import WebhookIntegrationType
44
44
45 from rhodecode.tests import GIT_REPO, HG_REPO
45 from rhodecode.tests import GIT_REPO, HG_REPO
46 from rhodecode.tests.conftest import HTTPBIN_DOMAIN
46 from rhodecode.tests.fixture import Fixture
47 from rhodecode.tests.fixture import Fixture
47 from rhodecode.tests.server_utils import RcWebServer
48 from rhodecode.tests.server_utils import RcWebServer
48
49
@@ -53,10 +54,6 b" GIT_REPO_WITH_GROUP = f'{REPO_GROUP}/{GI"
53
54
54 log = logging.getLogger(__name__)
55 log = logging.getLogger(__name__)
55
56
56 # Docker image running httpbin...
57 HTTPBIN_DOMAIN = 'http://httpbin:9090'
58 HTTPBIN_POST = HTTPBIN_DOMAIN + '/post'
59
60
57
61 def check_httpbin_connection():
58 def check_httpbin_connection():
62 try:
59 try:
General Comments 0
You need to be logged in to leave comments. Login now