diff options
| author | hanxi.liu <hanxi.liu@easystack.cn> | 2017-03-28 18:15:11 +0800 |
|---|---|---|
| committer | Hanxi_Liu <hanxi.liu@easystack.cn> | 2017-03-31 00:10:46 +0800 |
| commit | e18f2099449513b4493583116f946a4516416a6a (patch) | |
| tree | ac044a90da37dbd92d132411937a25252ae7f6b8 | |
| parent | b9b1fb5e888a9876e81cbecc00fa6bb481c3c19e (diff) | |
| download | ceilometer-stable/mitaka.tar.gz | |
Add tempest and cap oslo.messaging/tempest versionmitaka-eol6.1.5stable/mitaka
Cap oslo.messaging to 5.17.1, the latest version has been deprecated
notifer 'topic' which takes issues in ceilometer mitaka version.
add tempest to test-requirements.txt
Closes-Bug: #1573654
(cherry picked from commit be8c615bb0e8a30275e31cc2221213d70eb9611d)
Cap tempest to 12.2.0 as the call_until_true has been deprecated after
13.0.0.
test.call_until_true has been deprecated since Newton on Tempest side,
and now Tempest provides test_utils.call_until_true as the stable
library method. So this patch switches to use the stable method before
removing old test.call_until_true on Tempest side.
(cherry picked from commit d46c28b30c10fd1f6718add98be9cfc8682b3f8b)
Change-Id: I7e18b14c6dcfc21e47b0e90ebd2fc17936377c25
| -rw-r--r-- | ceilometer/tests/tempest/scenario/test_object_storage_telemetry_middleware.py | 12 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 1 |
3 files changed, 9 insertions, 6 deletions
diff --git a/ceilometer/tests/tempest/scenario/test_object_storage_telemetry_middleware.py b/ceilometer/tests/tempest/scenario/test_object_storage_telemetry_middleware.py index 0d99ee35..f0c97b08 100644 --- a/ceilometer/tests/tempest/scenario/test_object_storage_telemetry_middleware.py +++ b/ceilometer/tests/tempest/scenario/test_object_storage_telemetry_middleware.py @@ -17,6 +17,7 @@ from oslo_log import log as logging from tempest.common.utils import data_utils from tempest import config +from tempest.lib.common.utils import test_utils from tempest import test from ceilometer.tests.tempest.service import client @@ -113,11 +114,12 @@ class TestObjectStorageTelemetry(test.BaseTestCase): return (container_name in containers and obj_name in objects) - self.assertTrue(test.call_until_true(_check_samples, - NOTIFICATIONS_WAIT, - NOTIFICATIONS_SLEEP), - 'Correct notifications were not received after ' - '%s seconds.' % NOTIFICATIONS_WAIT) + self.assertTrue( + test_utils.call_until_true(_check_samples, + NOTIFICATIONS_WAIT, + NOTIFICATIONS_SLEEP), + 'Correct notifications were not received after ' + '%s seconds.' % NOTIFICATIONS_WAIT) def create_container(self): name = data_utils.rand_name('swift-scenario-container') diff --git a/requirements.txt b/requirements.txt index a0fbf4f1..058ceaba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,7 +22,7 @@ oslo.service>=1.0.0 # Apache-2.0 PasteDeploy>=1.5.0 # MIT pbr>=1.6 # Apache-2.0 pecan>=1.0.0 # BSD -oslo.messaging>=4.0.0 # Apache-2.0 +oslo.messaging>=4.0.0,<=5.17.1 # Apache-2.0 oslo.middleware>=3.0.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 oslo.utils>=3.5.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 1989202f..4a312a27 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -34,4 +34,5 @@ testtools>=1.4.0 # MIT gabbi>=1.11.0 # Apache-2.0 requests-aws>=0.1.4 # BSD License (3 clause) tempest-lib>=0.14.0 # Apache-2.0 +tempest>=14.0.0 # Apache-2.0 WebTest>=2.0 # MIT |