Revision 14c94c48 snf-cyclades-app/synnefo/api/test/images.py
b/snf-cyclades-app/synnefo/api/test/images.py | ||
---|---|---|
66 | 66 |
images = [{'id': 1, 'name': 'image-1'}, |
67 | 67 |
{'id': 2, 'name': 'image-2'}, |
68 | 68 |
{'id': 3, 'name': 'image-3'}] |
69 |
mimage().list.return_value = images |
|
69 |
mimage().list_images.return_value = images
|
|
70 | 70 |
response = self.get('/api/v1.1/images/', 'user') |
71 | 71 |
self.assertSuccess(response) |
72 | 72 |
api_images = json.loads(response.content)['images']['values'] |
... | ... | |
115 | 115 |
'progress': 100, |
116 | 116 |
'created': '2012-11-26T11:52:54+00:00', |
117 | 117 |
'updated': '2012-12-26T11:52:54+00:00'}] |
118 |
mimage().list.return_value = images |
|
118 |
mimage().list_images.return_value = images
|
|
119 | 119 |
response = self.get('/api/v1.1/images/detail', 'user') |
120 | 120 |
self.assertSuccess(response) |
121 | 121 |
api_images = json.loads(response.content)['images']['values'] |
... | ... | |
146 | 146 |
'updated_at': new_time.isoformat(), |
147 | 147 |
'deleted_at': new_time.isoformat(), |
148 | 148 |
'properties': ''}] |
149 |
mimage().iter.return_value = images
|
|
149 |
mimage().list_images.return_value = images
|
|
150 | 150 |
response =\ |
151 | 151 |
self.get('/api/v1.1/images/detail?changes-since=%sUTC' % new_time) |
152 | 152 |
self.assertSuccess(response) |
... | ... | |
235 | 235 |
backend.return_value.get_image.return_value = self.image |
236 | 236 |
response = self.delete('/api/v1.1/images/42/meta/foo', 'user') |
237 | 237 |
self.assertEqual(response.status_code, 204) |
238 |
backend.return_value.update.assert_called_once_with('42', {'properties': {'foo2': |
|
238 |
backend.return_value.update_metadata.assert_called_once_with('42', {'properties': {'foo2':
|
|
239 | 239 |
'bar2'}}) |
240 | 240 |
|
241 | 241 |
@assert_backend_closed |
... | ... | |
245 | 245 |
response = self.put('/api/v1.1/images/42/meta/foo3', 'user', |
246 | 246 |
json.dumps(request), 'json') |
247 | 247 |
self.assertEqual(response.status_code, 201) |
248 |
backend.return_value.update.assert_called_once_with('42', |
|
248 |
backend.return_value.update_metadata.assert_called_once_with('42',
|
|
249 | 249 |
{'properties': |
250 | 250 |
{'foo': 'bar', 'foo2': 'bar2', 'foo3': 'bar3'}}) |
251 | 251 |
|
... | ... | |
288 | 288 |
response = self.post('/api/v1.1/images/42/meta', 'user', |
289 | 289 |
json.dumps(request), 'json') |
290 | 290 |
self.assertEqual(response.status_code, 201) |
291 |
backend.return_value.update.assert_called_once_with('42', |
|
291 |
backend.return_value.update_metadata.assert_called_once_with('42',
|
|
292 | 292 |
{'properties': |
293 | 293 |
{'foo': 'bar_new', 'foo2': 'bar2', 'foo4': 'bar4'} |
294 | 294 |
}) |
Also available in: Unified diff