From 476f48ebdd1f1e9a80292a15938e15a478d14072 Mon Sep 17 00:00:00 2001 From: wangxiyuan Date: Thu, 1 Dec 2016 15:27:37 +0800 Subject: [PATCH] Fix CI failure Functional test CI is broken. Change-Id: Ia06f6306ac9b1fbbd5b9630f9b2972a85b1ea096 --- tests/functional/queues/v1/test_claims.py | 2 -- tests/functional/queues/v1/test_flavor.py | 2 -- tests/functional/queues/v1/test_pool.py | 1 - tests/functional/queues/v1/test_queues.py | 2 -- tests/functional/queues/v2/test_claims.py | 1 - tests/functional/queues/v2/test_flavor.py | 1 - tests/functional/queues/v2/test_health.py | 1 - tests/functional/queues/v2/test_pool.py | 1 - tests/functional/queues/v2/test_queues.py | 1 - tests/functional/queues/v2/test_subscription.py | 1 - zaqarclient/tests/queues/base.py | 6 +++++- 11 files changed, 5 insertions(+), 14 deletions(-) diff --git a/tests/functional/queues/v1/test_claims.py b/tests/functional/queues/v1/test_claims.py index 844d8f16..6d4d41c1 100644 --- a/tests/functional/queues/v1/test_claims.py +++ b/tests/functional/queues/v1/test_claims.py @@ -22,7 +22,6 @@ class QueuesV1ClaimHttpFunctionalTest(claims.QueuesV1ClaimFunctionalTest): is_functional = True transport_cls = http.HttpTransport - url = 'http://127.0.0.1:8888' version = 1 @@ -30,5 +29,4 @@ class QueuesV1_1ClaimHttpFunctionalTest(claims.QueuesV1_1ClaimFunctionalTest): is_functional = True transport_cls = http.HttpTransport - url = 'http://127.0.0.1:8888' version = 1.1 diff --git a/tests/functional/queues/v1/test_flavor.py b/tests/functional/queues/v1/test_flavor.py index be4cf19e..4ba7b08d 100644 --- a/tests/functional/queues/v1/test_flavor.py +++ b/tests/functional/queues/v1/test_flavor.py @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. - from zaqarclient.tests.queues import flavor from zaqarclient.transport import http @@ -23,5 +22,4 @@ class QueuesV1_1FlavorHttpFunctionalTest( is_functional = True transport_cls = http.HttpTransport - url = 'http://127.0.0.1:8888' version = 1.1 diff --git a/tests/functional/queues/v1/test_pool.py b/tests/functional/queues/v1/test_pool.py index 64f0e57f..e4c437a9 100644 --- a/tests/functional/queues/v1/test_pool.py +++ b/tests/functional/queues/v1/test_pool.py @@ -22,5 +22,4 @@ class QueuesV1_1PoolHttpFunctionalTest(pool.QueuesV1_1PoolFunctionalTest): is_functional = True transport_cls = http.HttpTransport - url = 'http://127.0.0.1:8888' version = 1.1 diff --git a/tests/functional/queues/v1/test_queues.py b/tests/functional/queues/v1/test_queues.py index b76c8a82..c5cb2b53 100644 --- a/tests/functional/queues/v1/test_queues.py +++ b/tests/functional/queues/v1/test_queues.py @@ -22,7 +22,6 @@ class QueuesV1QueueHttpFunctionalTest(queues.QueuesV1QueueFunctionalTest): is_functional = True transport_cls = http.HttpTransport - url = 'http://127.0.0.1:8888' version = 1 @@ -30,5 +29,4 @@ class QueuesV1_1QueueHttpFunctionalTest(queues.QueuesV1_1QueueFunctionalTest): is_functional = True transport_cls = http.HttpTransport - url = 'http://127.0.0.1:8888' version = 1.1 diff --git a/tests/functional/queues/v2/test_claims.py b/tests/functional/queues/v2/test_claims.py index e4282cfd..1556fcc2 100644 --- a/tests/functional/queues/v2/test_claims.py +++ b/tests/functional/queues/v2/test_claims.py @@ -21,5 +21,4 @@ class QueuesV2ClaimHttpFunctionalTest(claims.QueuesV2ClaimFunctionalTest): is_functional = True transport_cls = http.HttpTransport - url = 'http://127.0.0.1:8888' version = 2 diff --git a/tests/functional/queues/v2/test_flavor.py b/tests/functional/queues/v2/test_flavor.py index 942b64ef..56d665b8 100644 --- a/tests/functional/queues/v2/test_flavor.py +++ b/tests/functional/queues/v2/test_flavor.py @@ -22,5 +22,4 @@ class QueuesV2FlavorHttpFunctionalTest(flavor.QueuesV2FlavorFunctionalTest): is_functional = True transport_cls = http.HttpTransport - url = 'http://127.0.0.1:8888' version = 2 diff --git a/tests/functional/queues/v2/test_health.py b/tests/functional/queues/v2/test_health.py index e0be83ca..7c5bffbf 100644 --- a/tests/functional/queues/v2/test_health.py +++ b/tests/functional/queues/v2/test_health.py @@ -23,5 +23,4 @@ class QueuesV2HealthHttpFunctionalTest( is_functional = True transport_cls = http.HttpTransport - url = 'http://127.0.0.1:8888' version = 2 diff --git a/tests/functional/queues/v2/test_pool.py b/tests/functional/queues/v2/test_pool.py index 5589a1cd..4b3f6313 100644 --- a/tests/functional/queues/v2/test_pool.py +++ b/tests/functional/queues/v2/test_pool.py @@ -22,5 +22,4 @@ class QueuesV2PoolHttpFunctionalTest(pool.QueuesV2PoolFunctionalTest): is_functional = True transport_cls = http.HttpTransport - url = 'http://127.0.0.1:8888' version = 2 diff --git a/tests/functional/queues/v2/test_queues.py b/tests/functional/queues/v2/test_queues.py index 5ef40ca6..1118b06a 100644 --- a/tests/functional/queues/v2/test_queues.py +++ b/tests/functional/queues/v2/test_queues.py @@ -22,5 +22,4 @@ class QueuesV2QueueHttpFunctionalTest(queues.QueuesV2QueueFunctionalTest): is_functional = True transport_cls = http.HttpTransport - url = 'http://127.0.0.1:8888' version = 2 diff --git a/tests/functional/queues/v2/test_subscription.py b/tests/functional/queues/v2/test_subscription.py index 10221eb6..54401072 100644 --- a/tests/functional/queues/v2/test_subscription.py +++ b/tests/functional/queues/v2/test_subscription.py @@ -23,5 +23,4 @@ class QueuesV2SubscriptionHttpFunctionalTest( is_functional = True transport_cls = http.HttpTransport - url = 'http://127.0.0.1:8888' version = 2 diff --git a/zaqarclient/tests/queues/base.py b/zaqarclient/tests/queues/base.py index 245d97f2..dfea7e1e 100644 --- a/zaqarclient/tests/queues/base.py +++ b/zaqarclient/tests/queues/base.py @@ -14,16 +14,20 @@ # limitations under the License. import mock +from oslo_utils import netutils from zaqarclient.queues import client from zaqarclient.tests import base from zaqarclient.tests.transport import dummy +MY_IP = netutils.get_my_ipv4() + + class QueuesTestBase(base.TestBase): transport_cls = dummy.DummyTransport - url = 'http://127.0.0.1:8888/v1' + url = 'http://%s:8888' % MY_IP version = 1 def setUp(self):