Adopt to the new endpoint url

Recent update in devstack plugin introduced additional path in endpoint
url.

Depends-on: https://review.opendev.org/936110
Change-Id: Ifd0642cae86c1cab7c7faff36b0205e9c5f3a1be
This commit is contained in:
Takashi Kajinami
2024-11-25 10:29:37 +09:00
parent 19de5b2e3e
commit c9a6a440cc
3 changed files with 6 additions and 4 deletions

View File

@@ -7,8 +7,6 @@
- opendev.org/openstack/zaqar - opendev.org/openstack/zaqar
- opendev.org/openstack/zaqar-tempest-plugin - opendev.org/openstack/zaqar-tempest-plugin
vars: vars:
devstack_localrc:
ZAQAR_SERVICE_HOST: localhost
devstack_plugins: devstack_plugins:
zaqar: https://opendev.org/openstack/zaqar zaqar: https://opendev.org/openstack/zaqar
devstack_services: devstack_services:
@@ -27,7 +25,7 @@
# The failing job can be checked by removing this filter. # The failing job can be checked by removing this filter.
tox_extra_args: -vv -- tests.functional.queues.v2.test_health tox_extra_args: -vv -- tests.functional.queues.v2.test_health
tox_environment: tox_environment:
ZAQAR_SERVICE_HOST: localhost ZAQAR_ENDPOINT: "http://localhost/messaging"
- project: - project:
templates: templates:

View File

@@ -37,6 +37,7 @@ setenv =
ZAQARCLIENT_TEST_FUNCTIONAL = 1 ZAQARCLIENT_TEST_FUNCTIONAL = 1
passenv = passenv =
ZAQAR_SERVICE_HOST ZAQAR_SERVICE_HOST
ZAQAR_ENDPOINT
[testenv:venv] [testenv:venv]
commands = {posargs} commands = {posargs}

View File

@@ -24,12 +24,15 @@ from zaqarclient.tests.transport import dummy
MY_IP = os.environ.get('ZAQAR_SERVICE_HOST', netutils.get_my_ipv4()) MY_IP = os.environ.get('ZAQAR_SERVICE_HOST', netutils.get_my_ipv4())
ZAQAR_ENDPOINT = os.environ.get(
'ZAQAR_ENDPOINT',
'http://%s:8888' % netutils.escape_ipv6(MY_IP))
class QueuesTestBase(base.TestBase): class QueuesTestBase(base.TestBase):
transport_cls = dummy.DummyTransport transport_cls = dummy.DummyTransport
url = 'http://%s:8888' % netutils.escape_ipv6(MY_IP) url = ZAQAR_ENDPOINT
version = 1 version = 1
def setUp(self): def setUp(self):