commit 39de3e18fcce4491f84686eeac67a0a7997a932e
author Jenkins <jenkins@review.openstack.org> Mon Aug 14 12:24:32 2017 +0000
committer Gerrit Code Review <review@openstack.org> Mon Aug 14 12:24:32 2017 +0000
tree 6d0b412ab8d9dcde9c7aca6ecf8289df7d02c0cb
parent 4882b72b06599603aa5a7b4e8a64eef1a027808a
parent 5200ac72c7045e9cb6f53e52151bd556d22da66a

Merge "Use zaqar v2 in integration tests"

functional/test_event_sinks.py

diff --git a/functional/test_event_sinks.py b/functional/test_event_sinks.py
index a7e7579..61f1bfa 100644
--- a/functional/test_event_sinks.py
+++ b/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.common import test
 from heat_integrationtests.functional import functional_base
@@ -53,7 +53,7 @@
             }
         }
 
-        zaqar = zaqarclient.Client(conf=conf, version=1.1)
+        zaqar = zaqarclient.Client(conf=conf)
         queue = zaqar.queue(queue_id)
 
         def validate_messages():

functional/test_waitcondition.py

diff --git a/functional/test_waitcondition.py b/functional/test_waitcondition.py
index fd5399f..f79d49b 100644
--- a/functional/test_waitcondition.py
+++ b/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 @@
             }
         }
 
-        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})