Revision 13c02904
b/kamaki/clients/pithos/test.py | ||
---|---|---|
532 | 532 |
perm_str += ';' if perm_str else '' |
533 | 533 |
perm_str += '%s=%s' % (ptype, ','.join(pval)) |
534 | 534 |
exp += [call('X-Object-Sharing', perm_str)] |
535 |
exp += [call('X-Object-Public', public)] |
|
535 |
exp += [call('X-Object-Public', public, public is not None)]
|
|
536 | 536 |
for k, v in metas.items(): |
537 | 537 |
exp += [call('X-Object-Meta-%s' % k, v)] |
538 | 538 |
self.assertEqual(SH.mock_calls[- len(exp):], exp) |
... | ... | |
586 | 586 |
perm_str += ';' if perm_str else '' |
587 | 587 |
perm_str += '%s=%s' % (ptype, ','.join(pval)) |
588 | 588 |
exp += [call('X-Object-Sharing', perm_str)] |
589 |
exp += [call('X-Object-Public', public)] |
|
589 |
exp += [call('X-Object-Public', public, public is not None)]
|
|
590 | 590 |
for k, v in metas.items(): |
591 | 591 |
exp += [call('X-Object-Meta-%s' % k, v)] |
592 | 592 |
self.assertEqual(SH.mock_calls[- len(exp):], exp) |
... | ... | |
638 | 638 |
perm_str += ';' if perm_str else '' |
639 | 639 |
perm_str += '%s=%s' % (ptype, ','.join(pval)) |
640 | 640 |
exp += [call('X-Object-Sharing', perm_str)] |
641 |
exp += [call('X-Object-Public', public)] |
|
641 |
exp += [call('X-Object-Public', public, public is not None)]
|
|
642 | 642 |
for k, v in metas.items(): |
643 | 643 |
exp += [call('X-Object-Meta-%s' % k, v)] |
644 | 644 |
self.assertEqual(SH.mock_calls[- len(exp):], exp) |
... | ... | |
700 | 700 |
perm_str += ';' if perm_str else '' |
701 | 701 |
perm_str += '%s=%s' % (ptype, ','.join(pval)) |
702 | 702 |
exp += [call('X-Object-Sharing', perm_str)] |
703 |
exp += [call('X-Object-Public', public)] |
|
703 |
exp += [call('X-Object-Public', public, public is not None)]
|
|
704 | 704 |
for k, v in metas.items(): |
705 | 705 |
exp += [call('X-Object-Meta-%s' % k, v)] |
706 | 706 |
self.assertEqual(SH.mock_calls[- len(exp):], exp) |
Also available in: Unified diff