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:
		@@ -7,8 +7,6 @@
 | 
			
		||||
      - opendev.org/openstack/zaqar
 | 
			
		||||
      - opendev.org/openstack/zaqar-tempest-plugin
 | 
			
		||||
    vars:
 | 
			
		||||
      devstack_localrc:
 | 
			
		||||
        ZAQAR_SERVICE_HOST: localhost
 | 
			
		||||
      devstack_plugins:
 | 
			
		||||
        zaqar: https://opendev.org/openstack/zaqar
 | 
			
		||||
      devstack_services:
 | 
			
		||||
@@ -27,7 +25,7 @@
 | 
			
		||||
      # The failing job can be checked by removing this filter.
 | 
			
		||||
      tox_extra_args: -vv -- tests.functional.queues.v2.test_health
 | 
			
		||||
      tox_environment:
 | 
			
		||||
        ZAQAR_SERVICE_HOST: localhost
 | 
			
		||||
        ZAQAR_ENDPOINT: "http://localhost/messaging"
 | 
			
		||||
 | 
			
		||||
- project:
 | 
			
		||||
    templates:
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1
									
								
								tox.ini
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								tox.ini
									
									
									
									
									
								
							@@ -37,6 +37,7 @@ setenv =
 | 
			
		||||
  ZAQARCLIENT_TEST_FUNCTIONAL = 1
 | 
			
		||||
passenv =
 | 
			
		||||
  ZAQAR_SERVICE_HOST
 | 
			
		||||
  ZAQAR_ENDPOINT
 | 
			
		||||
 | 
			
		||||
[testenv:venv]
 | 
			
		||||
commands = {posargs}
 | 
			
		||||
 
 | 
			
		||||
@@ -24,12 +24,15 @@ from zaqarclient.tests.transport import dummy
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
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):
 | 
			
		||||
 | 
			
		||||
    transport_cls = dummy.DummyTransport
 | 
			
		||||
    url = 'http://%s:8888' % netutils.escape_ipv6(MY_IP)
 | 
			
		||||
    url = ZAQAR_ENDPOINT
 | 
			
		||||
    version = 1
 | 
			
		||||
 | 
			
		||||
    def setUp(self):
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user