Revision d15e5249

b/kamaki/clients/pithos/test.py
222 222
        r = self.client.get_container_info(until=u)
223 223
        self.assertEqual(ch.mock_calls, [call(until=None), call(until=u)])
224 224

  
225
    @patch('%s.delete' % pithos_pkg, return_value=FR())
226
    def test_delete_container(self, delete):
227
        FR.status_code = 204
228
        cont = 's0m3c0n731n3r'
229
        self.client.delete_container(cont)
230
        for err_code in (404, 409):
231
            FR.status_code = err_code
232
            self.assertRaises(ClientError, self.client.delete_container, cont)
233
        acall = call('/%s/%s' % (user_id, cont), success=(204, 404, 409))
234
        self.assertEqual(delete.mock_calls, [acall] * 3)
235

  
236 225
    @patch('%s.account_get' % pithos_pkg, return_value=FR())
237 226
    def test_list_containers(self, get):
238 227
        FR.json = container_list
b/kamaki/clients/storage/test.py
250 250
        FR.status_code = 404
251 251
        self.assertRaises(ClientError, self.client.get_container_info, cont)
252 252

  
253
    """
254
    @patch('%s.delete' % pithos_pkg, return_value=FR())
253
    @patch('%s.delete' % storage_pkg, return_value=FR())
255 254
    def test_delete_container(self, delete):
256 255
        FR.status_code = 204
257 256
        cont = 's0m3c0n731n3r'
......
262 261
        acall = call('/%s/%s' % (user_id, cont), success=(204, 404, 409))
263 262
        self.assertEqual(delete.mock_calls, [acall] * 3)
264 263

  
264
    """
265 265
    @patch('%s.account_get' % pithos_pkg, return_value=FR())
266 266
    def test_list_containers(self, get):
267 267
        FR.json = container_list

Also available in: Unified diff