Merge "Use @test.services instead of skipUnless"
This commit is contained in:
commit
64b07b7ee1
@ -118,9 +118,8 @@ class VolumesBackupsTest(base.BaseVolumeTest):
|
||||
name=backup_name, force=True)
|
||||
self.assertEqual(backup_name, backup['name'])
|
||||
|
||||
@testtools.skipUnless(CONF.service_available.glance,
|
||||
"Glance is not available")
|
||||
@decorators.idempotent_id('2a8ba340-dff2-4511-9db7-646f07156b15')
|
||||
@test.services('image')
|
||||
def test_bootable_volume_backup_and_restore(self):
|
||||
# Create volume from image
|
||||
img_uuid = CONF.compute.image_ref
|
||||
|
@ -13,11 +13,10 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import testtools
|
||||
|
||||
from tempest.api.volume import base
|
||||
from tempest import config
|
||||
from tempest.lib import decorators
|
||||
from tempest import test
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
@ -47,9 +46,8 @@ class VolumesCloneTest(base.BaseVolumeTest):
|
||||
self.assertEqual(volume['source_volid'], src_vol['id'])
|
||||
self.assertEqual(volume['size'], src_size + 1)
|
||||
|
||||
@testtools.skipUnless(CONF.service_available.glance,
|
||||
"Glance is not available")
|
||||
@decorators.idempotent_id('cbbcd7c6-5a6c-481a-97ac-ca55ab715d16')
|
||||
@test.services('image')
|
||||
def test_create_from_bootable_volume(self):
|
||||
# Create volume from image
|
||||
img_uuid = CONF.compute.image_ref
|
||||
|
Loading…
x
Reference in New Issue
Block a user