commit e620b5abf261224794e1085082c52b9a04cdfa43
author Jenkins <jenkins@review.openstack.org> Thu Mar 30 14:17:38 2017 +0000
committer Gerrit Code Review <review@openstack.org> Thu Mar 30 14:17:38 2017 +0000
tree 836999e10579817e5d0b6864978a77fef8448de9
parent 6487283f6e10e88b6e24ac148335201a38f0653a
parent ba37ac443fed68c96e69b1643c77c5faad9e5459

Merge "Volume reset to maintenance mode"

tempest/api/volume/admin/test_volumes_actions.py

diff --git a/tempest/api/volume/admin/test_volumes_actions.py b/tempest/api/volume/admin/test_volumes_actions.py
index 02b10f9..990900b 100644
--- a/tempest/api/volume/admin/test_volumes_actions.py
+++ b/tempest/api/volume/admin/test_volumes_actions.py
@@ -32,7 +32,9 @@
     def test_volume_reset_status(self):
         # test volume reset status : available->error->available
         volume = self.create_volume()
-        for status in ['error', 'available']:
+        self.addCleanup(self.admin_volume_client.reset_volume_status,
+                        volume['id'], status='available')
+        for status in ['error', 'available', 'maintenance']:
             self.admin_volume_client.reset_volume_status(
                 volume['id'], status=status)
             volume_get = self.admin_volume_client.show_volume(