Revision e46b2bcf snf-pithos-tools/pithos/tools/test.py

b/snf-pithos-tools/pithos/tools/test.py
117 117

  
118 118
    def _clean_account(self):
119 119
        for c in self.client.list_containers():
120
            while True:
121
                #list objects returns at most 10000 objects
122
                #so repeat until there are no more objects
123
                objects = self.client.list_objects(c)
124
                if not objects:
125
                    break
126
                for o in objects:
127
                    self.client.delete_object(c, o)
120
            self.client.delete_container(c, delimiter='/')
128 121
            self.client.delete_container(c)
129

  
122
    
130 123
    def assert_status(self, status, codes):
131 124
        l = [elem for elem in self.return_codes]
132 125
        if type(codes) == types.ListType:
......
850 843

  
851 844
    def test_delete_invalid(self):
852 845
        self.assert_raises_fault(404, self.client.delete_container, 'c3')
846
    
847
    def test_delete_contents(self):
848
        self.client.create_folder(self.containers[0], 'folder-1')
849
        self.upload_random_data(self.containers[1], 'folder-1/%s' % o_names[0])
850
        self.client.create_folder(self.containers[0], 'folder-1/subfolder')
851
        self.client.create_folder(self.containers[0], 'folder-2/%s' % o_names[1])
852
                
853
        objects = self.client.list_objects(self.containers[0])
854
        self.client.delete_container(self.containers[0], delimiter='/')
855
        for o in objects:
856
            self.assert_object_not_exists(self.containers[0], o)
857
        self.assert_container_exists(self.containers[0])
853 858

  
854 859
class ObjectGet(BaseTestCase):
855 860
    def setUp(self):

Also available in: Unified diff