Revision 1b80cb25
| b/kamaki/clients/pithos/rest_api.py | ||
|---|---|---|
| 435 | 435 |
return self.head(path, *args, success=success, **kwargs) |
| 436 | 436 |
|
| 437 | 437 |
def object_get( |
| 438 |
self, object,
|
|
| 438 |
self, obj, |
|
| 439 | 439 |
format='json', |
| 440 | 440 |
hashmap=False, |
| 441 | 441 |
version=None, |
| ... | ... | |
| 480 | 480 |
self._assert_container() |
| 481 | 481 |
|
| 482 | 482 |
self.set_param('format', format, iff=format)
|
| 483 |
self.set_param('version', version, iff=version)
|
|
| 484 | 483 |
self.set_param('hashmap', hashmap, iff=hashmap)
|
| 484 |
self.set_param('version', version, iff=version)
|
|
| 485 | 485 |
|
| 486 | 486 |
self.set_header('Range', data_range)
|
| 487 | 487 |
self.set_header('If-Range', '', if_range and data_range)
|
| ... | ... | |
| 490 | 490 |
self.set_header('If-Modified-Since', if_modified_since)
|
| 491 | 491 |
self.set_header('If-Unmodified-Since', if_unmodified_since)
|
| 492 | 492 |
|
| 493 |
path = path4url(self.account, self.container, object)
|
|
| 493 |
path = path4url(self.account, self.container, obj) |
|
| 494 | 494 |
success = kwargs.pop('success', 200)
|
| 495 | 495 |
return self.get(path, *args, success=success, **kwargs) |
| 496 | 496 |
|
| b/kamaki/clients/pithos/test.py | ||
|---|---|---|
| 443 | 443 |
success=kwargs.pop('success', 200),
|
| 444 | 444 |
**kwargs)) |
| 445 | 445 |
|
| 446 |
@patch('%s.set_param' % rest_pkg)
|
|
| 447 |
@patch('%s.set_header' % rest_pkg)
|
|
| 448 |
@patch('%s.get' % rest_pkg, return_value=FR())
|
|
| 449 |
def test_object_get(self, get, SH, SP): |
|
| 450 |
for pm in product( |
|
| 451 |
('json', 'f0rm47'),
|
|
| 452 |
(False, True), |
|
| 453 |
(None, 'v3r510n'), |
|
| 454 |
(None, 'range=74-63'), |
|
| 455 |
(False, True), |
|
| 456 |
(None, '3746'), |
|
| 457 |
(None, 'non-3746'), |
|
| 458 |
(None, '1f-m0d'), |
|
| 459 |
(None, '1f-unm0d'), |
|
| 460 |
((), ('someval',)),
|
|
| 461 |
(dict(), dict(success=400), dict(k='v', v='k'))): |
|
| 462 |
args, kwargs = pm[-2:] |
|
| 463 |
pm = pm[:-2] |
|
| 464 |
self.client.object_get(obj, *(pm + args), **kwargs) |
|
| 465 |
format, hashmap, version = pm[:3] |
|
| 466 |
self.assertEqual(SP.mock_calls[-3:], [ |
|
| 467 |
call('format', format, iff=format),
|
|
| 468 |
call('hashmap', hashmap, iff=hashmap),
|
|
| 469 |
call('version', version, iff=version)])
|
|
| 470 |
rng, ifrng, im, inm, ims, ius = pm[-6:] |
|
| 471 |
self.assertEqual(SH.mock_calls[-6:], [ |
|
| 472 |
call('Range', rng),
|
|
| 473 |
call('If-Range', '', ifrng and rng),
|
|
| 474 |
call('If-Match', im),
|
|
| 475 |
call('If-None-Match', inm),
|
|
| 476 |
call('If-Modified-Since', ims),
|
|
| 477 |
call('If-Unmodified-Since', ius)])
|
|
| 478 |
acc, cont = self.client.account, self.client.container |
|
| 479 |
self.assertEqual(get.mock_calls[-1], call( |
|
| 480 |
'/%s/%s/%s' % (acc, cont, obj), |
|
| 481 |
*args, |
|
| 482 |
success=kwargs.pop('success', 200),
|
|
| 483 |
**kwargs)) |
|
| 484 |
|
|
| 446 | 485 |
|
| 447 | 486 |
class Pithos(TestCase): |
| 448 | 487 |
|
Also available in: Unified diff