Revision d85e02c5

b/kamaki/clients/test/pithos.py
427 427
        expected = dict()
428 428
        for k, v in object_info.items():
429 429
            expected[k] = v
430
        with patch.object(
431
                PC,
432
                'get_object_info',
433
                return_value=object_info):
430
        with patch.object(PC, 'get_object_info', return_value=object_info):
434 431
            r = self.client.get_object_meta(obj)
435 432
            self.assert_dicts_are_equal(r, expected)
436 433

  
......
561 558
    #  Pithos+ only methods
562 559

  
563 560
    def test_purge_container(self):
564
        with patch.object(
565
                PC,
566
                'container_delete',
567
                return_value=FR()) as cd:
561
        with patch.object(PC, 'container_delete', return_value=FR()) as cd:
568 562
            self.client.purge_container()
569 563
            self.assertTrue('until' in cd.mock_calls[-1][2])
570 564
            cont = self.client.container
......
836 830
        kwarg_list = [
837 831
            dict(delimiter=None, until=None),
838 832
            dict(delimiter='X', until='50m3d473')]
839
        with patch.object(
840
                PC,
841
                'container_delete',
842
                return_value=FR()) as delete:
833
        with patch.object(PC, 'container_delete', return_value=FR()) as delete:
843 834
            for kwarg in kwarg_list:
844 835
                self.client.del_container(**kwarg)
845 836
                expected = dict(kwarg)
......
849 840
                FR.status_code = status_code
850 841
                self.assertRaises(ClientError, self.client.del_container)
851 842

  
852
    def test_get_container_versioning(self):
843
    @patch(
844
        'kamaki.clients.pithos.PithosClient.get_container_info',
845
        return_value=container_info)
846
    def test_get_container_versioning(self, GCI):
853 847
        key = 'x-container-policy-versioning'
854 848
        cont = 'c0n7-417'
855 849
        bu_cnt = self.client.container
856
        with patch.object(
857
                PC,
858
                'get_container_info',
859
                return_value=container_info) as gci:
860
            for container in (None, cont):
861
                r = self.client.get_container_versioning(container=container)
862
                self.assertEqual(r[key], container_info[key])
863
                self.assertEqual(gci.mock_calls[-1], call())
864
                self.assertEqual(bu_cnt, self.client.container)
865

  
866
    def test_get_container_quota(self):
850
        for container in (None, cont):
851
            r = self.client.get_container_versioning(container=container)
852
            self.assertEqual(r[key], container_info[key])
853
            self.assertEqual(GCI.mock_calls[-1], call())
854
            self.assertEqual(bu_cnt, self.client.container)
855

  
856
    @patch(
857
        'kamaki.clients.pithos.PithosClient.get_container_info',
858
        return_value=container_info)
859
    def test_get_container_quota(self, GCI):
867 860
        key = 'x-container-policy-quota'
868 861
        cont = 'c0n7-417'
869 862
        bu_cnt = self.client.container
870
        with patch.object(
871
                PC,
872
                'get_container_info',
873
                return_value=container_info) as gci:
874
            for container in (None, cont):
875
                r = self.client.get_container_quota(container=container)
876
                self.assertEqual(r[key], container_info[key])
877
                self.assertEqual(gci.mock_calls[-1], call())
878
                self.assertEqual(bu_cnt, self.client.container)
863
        for container in (None, cont):
864
            r = self.client.get_container_quota(container=container)
865
            self.assertEqual(r[key], container_info[key])
866
            self.assertEqual(GCI.mock_calls[-1], call())
867
            self.assertEqual(bu_cnt, self.client.container)
879 868

  
880 869
    def test_get_container_meta(self):
881 870
        somedate = '50m3d473'
......
947 936
            for kwarg in kwargs:
948 937
                self.client.del_object(obj, **kwarg)
949 938
                self.assertEqual(delete.mock_calls[-1], call(obj, **kwarg))
939

  
940
    def test_set_object_meta(self):
941
        metas = dict(k1='v1', k2='v2', k3='v3')
942
        with patch.object(PC, 'object_post', return_value=FR()) as post:
943
            self.assertRaises(
944
                AssertionError,
945
                self.client.set_object_meta,
946
                obj, 'Non dict arg')
947
            self.client.set_object_meta(obj, metas)
948
            self.assertEqual(
949
                post.mock_calls[-1],
950
                call(obj, update=True, metadata=metas))

Also available in: Unified diff