Merge "handle new tempest swift interface"
diff --git a/ceilometer/tests/integration/hooks/post_test_hook.sh b/ceilometer/tests/integration/hooks/post_test_hook.sh
index eb5139a..37a4e2b 100755
--- a/ceilometer/tests/integration/hooks/post_test_hook.sh
+++ b/ceilometer/tests/integration/hooks/post_test_hook.sh
@@ -26,7 +26,7 @@
sudo /usr/os-testr-env/bin/subunit2html $BASE/logs/testrepository.subunit $BASE/logs/testr_results.html
sudo gzip -9 $BASE/logs/testrepository.subunit
sudo gzip -9 $BASE/logs/testr_results.html
- sudo chown jenkins:jenkins $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz
+ sudo chown $USER:$USER $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz
sudo chmod a+r $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz
}
@@ -62,7 +62,7 @@
gnocchi status
echo "* Unprocessed measures:"
- for key in $(redis-cli --scan --pattern 'incoming*'); do echo -n $key && redis-cli llen $key; done
+ for key in $(redis-cli --scan --pattern 'incoming*'); do echo -n "$key length = " && redis-cli llen $key; done
set -e
set -x
diff --git a/ceilometer/tests/tempest/api/test_telemetry_notification_api.py b/ceilometer/tests/tempest/api/test_telemetry_notification_api.py
index 65a86ad..ec754c8 100644
--- a/ceilometer/tests/tempest/api/test_telemetry_notification_api.py
+++ b/ceilometer/tests/tempest/api/test_telemetry_notification_api.py
@@ -16,10 +16,10 @@
import testtools
from ceilometer.tests.tempest.api import base
+from tempest.common import utils
from tempest import config
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators
-from tempest import test
CONF = config.CONF
@@ -37,7 +37,7 @@
raise cls.skipException(skip_msg)
@decorators.idempotent_id('d7f8c1c8-d470-4731-8604-315d3956caae')
- @test.services('compute')
+ @utils.services('compute')
def test_check_nova_notification(self):
body = self.create_server()
@@ -48,7 +48,7 @@
self.await_samples(metric, query)
@decorators.idempotent_id('c240457d-d943-439b-8aea-85e26d64fe8f')
- @test.services("image")
+ @utils.services("image")
@testtools.skipIf(not CONF.image_feature_enabled.api_v2,
"Glance api v2 is disabled")
def test_check_glance_v2_notifications(self):
@@ -77,7 +77,7 @@
raise cls.skipException(skip_msg)
@decorators.idempotent_id('29604198-8b45-4fc0-8af8-1cae4f94ebea')
- @test.services('compute')
+ @utils.services('compute')
def test_check_nova_notification_event_and_meter(self):
body = self.create_server()
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 be3e03a..e02e454 100644
--- a/ceilometer/tests/tempest/scenario/test_object_storage_telemetry_middleware.py
+++ b/ceilometer/tests/tempest/scenario/test_object_storage_telemetry_middleware.py
@@ -15,6 +15,7 @@
# under the License.
from oslo_log import log as logging
+from tempest.common import utils
from tempest import config
from tempest.lib.common.utils import data_utils
from tempest.lib.common.utils import test_utils
@@ -138,7 +139,7 @@
return obj_name
@decorators.idempotent_id('6d6b88e5-3e38-41bc-b34a-79f713a6cb85')
- @test.services('object_storage')
+ @utils.services('object_storage')
def test_swift_middleware_notifies(self):
container_name = self.create_container()
obj_name = self.upload_object_to_container(container_name)