diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-22 07:17:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-22 07:17:28 +0000 |
| commit | c20421c467872e407612e8bce85a76ef1cf9e025 (patch) | |
| tree | f0ca0920719245e5b5837e3e21787750c4ddb4d1 /openstackclient/tests/functional | |
| parent | 0bc70a344f96624afddc1ca028bd8f11aa3a657d (diff) | |
| parent | e76e10c0bac9cf87c564a7f0201df189f7cd8b52 (diff) | |
| download | python-openstackclient-c20421c467872e407612e8bce85a76ef1cf9e025.tar.gz | |
Merge "Remove deprecated volume commands and args"
Diffstat (limited to 'openstackclient/tests/functional')
| -rw-r--r-- | openstackclient/tests/functional/volume/v2/test_volume_backup.py (renamed from openstackclient/tests/functional/volume/v2/test_backup.py) | 4 | ||||
| -rw-r--r-- | openstackclient/tests/functional/volume/v2/test_volume_snapshot.py (renamed from openstackclient/tests/functional/volume/v2/test_snapshot.py) | 0 | ||||
| -rw-r--r-- | openstackclient/tests/functional/volume/v3/test_volume_snapshot.py (renamed from openstackclient/tests/functional/volume/v3/test_snapshot.py) | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/openstackclient/tests/functional/volume/v2/test_backup.py b/openstackclient/tests/functional/volume/v2/test_volume_backup.py index 8f5c032c..6868bd40 100644 --- a/openstackclient/tests/functional/volume/v2/test_backup.py +++ b/openstackclient/tests/functional/volume/v2/test_volume_backup.py @@ -46,14 +46,14 @@ class VolumeBackupTests(common.BaseVolumeTests): 'volume backup create -f json ' + vol_id )) - self.wait_for_status("backup", backup['id'], "available") + self.wait_for_status("volume backup", backup['id'], "available") # restore the backup backup_restored = json.loads(self.openstack( 'volume backup restore -f json %s %s' % (backup['id'], vol_id))) self.assertEqual(backup_restored['backup_id'], backup['id']) - self.wait_for_status("backup", backup['id'], "available") + self.wait_for_status("volume backup", backup['id'], "available") self.wait_for_status("volume", backup_restored['volume_id'], "available") self.addCleanup(self.openstack, 'volume delete %s' % vol_id) diff --git a/openstackclient/tests/functional/volume/v2/test_snapshot.py b/openstackclient/tests/functional/volume/v2/test_volume_snapshot.py index 264f4adb..264f4adb 100644 --- a/openstackclient/tests/functional/volume/v2/test_snapshot.py +++ b/openstackclient/tests/functional/volume/v2/test_volume_snapshot.py diff --git a/openstackclient/tests/functional/volume/v3/test_snapshot.py b/openstackclient/tests/functional/volume/v3/test_volume_snapshot.py index 38e0563a..28eee6d2 100644 --- a/openstackclient/tests/functional/volume/v3/test_snapshot.py +++ b/openstackclient/tests/functional/volume/v3/test_volume_snapshot.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from openstackclient.tests.functional.volume.v2 import test_snapshot as v2 +from openstackclient.tests.functional.volume.v2 import test_volume_snapshot as v2 # noqa from openstackclient.tests.functional.volume.v3 import common |