summaryrefslogtreecommitdiff
path: root/openstackclient/tests/unit
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-08-28 03:55:29 +0000
committerGerrit Code Review <review@openstack.org>2019-08-28 03:55:29 +0000
commit47a9f4f9d7ae087ca7b7506e2770fe0c5a184945 (patch)
tree4cdcb8a10a24af8b1037c5c30a754c41518150b2 /openstackclient/tests/unit
parentbb7f49168563414d65b4050e84a8d1d4915206bc (diff)
parent7882463fda77813c9e230373f0ab53c6c8574ba3 (diff)
downloadpython-openstackclient-47a9f4f9d7ae087ca7b7506e2770fe0c5a184945.tar.gz
Merge "Fix: Restore output 'VolumeBackupsRestore' object is not iterable" into stable/rocky
Diffstat (limited to 'openstackclient/tests/unit')
-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):