summaryrefslogtreecommitdiff
path: root/openstackclient/tests/unit/volume
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-02-28 17:52:37 +0000
committerGerrit Code Review <review@openstack.org>2019-02-28 17:52:37 +0000
commit3599ebe9333e618028c5ae2946e42a10fdb3621f (patch)
tree9fcfc601b6c86b2b11b1ef461027755bdaf5e576 /openstackclient/tests/unit/volume
parent3d7772e34ad421f6ce1362641e79a8da0255e455 (diff)
parent24255ad0dde608a19d371a27c13714098097f185 (diff)
downloadpython-openstackclient-3599ebe9333e618028c5ae2946e42a10fdb3621f.tar.gz
Merge "Fix: Restore output 'VolumeBackupsRestore' object is not iterable"
Diffstat (limited to 'openstackclient/tests/unit/volume')
-rw-r--r--openstackclient/tests/unit/volume/v2/test_backup.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/openstackclient/tests/unit/volume/v2/test_backup.py b/openstackclient/tests/unit/volume/v2/test_backup.py
index a8e81c7e..9a2ce718 100644
--- a/openstackclient/tests/unit/volume/v2/test_backup.py
+++ b/openstackclient/tests/unit/volume/v2/test_backup.py
@@ -367,7 +367,9 @@ class TestBackupRestore(TestBackup):
self.backups_mock.get.return_value = self.backup
self.volumes_mock.get.return_value = self.volume
- self.restores_mock.restore.return_value = None
+ self.restores_mock.restore.return_value = (
+ volume_fakes.FakeVolume.create_one_volume(
+ {'id': self.volume['id']}))
# Get the command object to mock
self.cmd = backup.RestoreVolumeBackup(self.app, None)
@@ -385,7 +387,7 @@ class TestBackupRestore(TestBackup):
result = self.cmd.take_action(parsed_args)
self.restores_mock.restore.assert_called_with(self.backup.id,
self.backup.volume_id)
- self.assertIsNone(result)
+ self.assertIsNotNone(result)
class TestBackupSet(TestBackup):