summaryrefslogtreecommitdiff
path: root/openstackclient/tests/unit
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-10-22 21:16:35 +0000
committerGerrit Code Review <review@openstack.org>2019-10-22 21:16:35 +0000
commitd2e809f12086171d227a06fd7ea19e0e36ed12f8 (patch)
tree8195ba9d1dea2d46737c4b6e13ac617837aa4054 /openstackclient/tests/unit
parent5eedf36db63ed5edc2315faa85bd95eb201eaefe (diff)
parent3a20c1b1e6c60e4966a967911350a8422d4d2242 (diff)
downloadpython-openstackclient-d2e809f12086171d227a06fd7ea19e0e36ed12f8.tar.gz
Merge "Fix: Restore output 'VolumeBackupsRestore' object is not iterable" into stable/queens
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):