Merge "Add skip for tests test_signed_image_upload_*" into mcp/xenial/rocky
diff --git a/barbican_tempest_plugin/tests/scenario/test_image_signing.py b/barbican_tempest_plugin/tests/scenario/test_image_signing.py
index fc552ba..90b6586 100644
--- a/barbican_tempest_plugin/tests/scenario/test_image_signing.py
+++ b/barbican_tempest_plugin/tests/scenario/test_image_signing.py
@@ -13,6 +13,8 @@
# under the License.
from oslo_log import log as logging
+import testtools
+
from tempest.api.compute import base as compute_base
from tempest.common import utils
from tempest import config
@@ -30,6 +32,9 @@
@decorators.attr(type='smoke')
@decorators.idempotent_id('4343df3c-5553-40ea-8705-0cce73b297a9')
@utils.services('compute', 'image')
+ @testtools.skipUnless(
+ CONF.compute_feature_enabled.barbican_integration_enabled,
+ 'Barbican integration must be enabled.')
def test_signed_image_upload_and_boot(self):
"""Test that Nova boots a signed image.
@@ -53,6 +58,9 @@
@decorators.attr(type='smoke')
@decorators.idempotent_id('74f022d6-a6ef-4458-96b7-541deadacf99')
@utils.services('compute', 'image')
+ @testtools.skipUnless(
+ CONF.compute_feature_enabled.barbican_integration_enabled,
+ 'Barbican integration must be enabled.')
def test_signed_image_upload_boot_failure(self):
"""Test that Nova refuses to boot an incorrectly signed image.