From 6d2c192b2c75ee4c6bb1994967f0677846d61873 Mon Sep 17 00:00:00 2001 From: rabi Date: Fri, 11 Aug 2017 09:49:49 +0530 Subject: [PATCH] Use zaqar v2 in integration tests zaqar v1/1.1 has been deprecated since long. Though it's enabled in the devstack plugin[1], this may cause some issues and potential data loss. Better remove all it's usage. [1] https://git.openstack.org/cgit/openstack/zaqar/tree/devstack/plugin.sh#n88 Change-Id: Ifa1636dcf296747735dc8d28c2feb108919c094d --- heat_integrationtests/functional/test_event_sinks.py | 4 ++-- heat_integrationtests/functional/test_waitcondition.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/heat_integrationtests/functional/test_event_sinks.py b/heat_integrationtests/functional/test_event_sinks.py index 5d9f566bea..95d0d1aee6 100644 --- a/heat_integrationtests/functional/test_event_sinks.py +++ b/heat_integrationtests/functional/test_event_sinks.py @@ -12,7 +12,7 @@ import uuid -from zaqarclient.queues.v1 import client as zaqarclient +from zaqarclient.queues.v2 import client as zaqarclient from heat_integrationtests.functional import functional_base @@ -52,7 +52,7 @@ resources: } } - zaqar = zaqarclient.Client(conf=conf, version=1.1) + zaqar = zaqarclient.Client(conf=conf) queue = zaqar.queue(queue_id) messages = list(queue.messages()) self.assertEqual(4, len(messages)) diff --git a/heat_integrationtests/functional/test_waitcondition.py b/heat_integrationtests/functional/test_waitcondition.py index fd5399fadc..f79d49bed6 100644 --- a/heat_integrationtests/functional/test_waitcondition.py +++ b/heat_integrationtests/functional/test_waitcondition.py @@ -13,7 +13,7 @@ import json from keystoneclient.v3 import client as keystoneclient -from zaqarclient.queues.v1 import client as zaqarclient +from zaqarclient.queues.v2 import client as zaqarclient from heat_integrationtests.functional import functional_base @@ -63,7 +63,7 @@ outputs: } } - zaqar = zaqarclient.Client(endpoint, conf=conf, version=1.1) + zaqar = zaqarclient.Client(endpoint, conf=conf) queue = zaqar.queue(signal['queue_id']) queue.post({'body': {'data': 'here!', 'id': 'data_id'}, 'ttl': 600})