Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix wrong mocks of Volume.revisions

Browse Source 
It's a dict, not a list.
This commit is contained in:
Rusty Bird 2018-01-20 23:20:22 +00:00
parent 206d3f136d
commit bf1f1ac5ff
No known key found for this signature in database
GPG Key ID: 469D78F47AAF2ADF
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qubes/tests/api_admin.py
View File

@ -381,7 +381,8 @@ class TC_00_VMs(AdminAPITestCase):
self.vm.volumes = unittest.mock.MagicMock()
volumes_conf = {
'keys.return_value': ['root', 'private', 'volatile', 'kernel'],
'__getitem__.return_value.revisions': ['rev1', 'rev2'],
'__getitem__.return_value.revisions':
{'rev2': '2018-02-22T22:22:22', 'rev1': '2018-01-11T11:11:11'},
}
self.vm.volumes.configure_mock(**volumes_conf)
value = self.call_mgmt_func(b'admin.vm.volume.ListSnapshots',
@ -413,7 +414,8 @@ class TC_00_VMs(AdminAPITestCase):
self.vm.volumes = unittest.mock.MagicMock()
volumes_conf = {
'keys.return_value': ['root', 'private', 'volatile', 'kernel'],
'__getitem__.return_value.revisions': ['rev1', 'rev2'],
'__getitem__.return_value.revisions':
{'rev2': '2018-02-22T22:22:22', 'rev1': '2018-01-11T11:11:11'},
}
self.vm.volumes.configure_mock(**volumes_conf)
with self.assertRaises(AssertionError):
@ -440,7 +442,8 @@ class TC_00_VMs(AdminAPITestCase):
self.vm.volumes = unittest.mock.MagicMock()
volumes_conf = {
'keys.return_value': ['root', 'private', 'volatile', 'kernel'],
'__getitem__.return_value.revisions': ['rev1', 'rev2'],
'__getitem__.return_value.revisions':
{'rev2': '2018-02-22T22:22:22', 'rev1': '2018-01-11T11:11:11'},
}
self.vm.volumes.configure_mock(**volumes_conf)
del self.vm.volumes['private'].revert('rev1')._is_coroutine
@ -462,7 +465,8 @@ class TC_00_VMs(AdminAPITestCase):
self.vm.volumes = unittest.mock.MagicMock()
volumes_conf = {
'keys.return_value': ['root', 'private', 'volatile', 'kernel'],
'__getitem__.return_value.revisions': ['rev1', 'rev2'],
'__getitem__.return_value.revisions':
{'rev2': '2018-02-22T22:22:22', 'rev1': '2018-01-11T11:11:11'},
}
self.vm.volumes.configure_mock(**volumes_conf)
self.vm.storage = unittest.mock.Mock()