Revision 450a6d2b snf-cyclades-app/synnefo/plankton/tests.py

b/snf-cyclades-app/synnefo/plankton/tests.py
109 109

  
110 110
    def assertFault(self, response, status_code, name):
111 111
        self.assertEqual(response.status_code, status_code)
112
        fault = json.loads(response.content)
113
        self.assertEqual(fault.keys(), [name])
112
        fault = response.content
113
        self.assertEqual(fault, name)
114 114

  
115 115
    def assertBadRequest(self, response):
116
        self.assertFault(response, 400, 'badRequest')
116
        self.assertFault(response, 400, '400 Bad Request')
117 117

  
118 118
    def assertItemNotFound(self, response):
119 119
        self.assertFault(response, 404, 'itemNotFound')
......
233 233
        response = self.get("/plankton/images/?size_max=1000")
234 234
        self.assertSuccess(response)
235 235
        backend.return_value\
236
                .list.assert_called_once_with({'size_max': '1000'},
236
                .list.assert_called_once_with({'size_max': 1000},
237 237
                                              {'sort_key': 'created_at',
238 238
                                               'sort_dir': 'desc'})
239 239

  
240 240
    @assert_backend_closed
241
    def test_list_images_filters_error_1(self, backend):
242
        response = self.get("/plankton/images/?size_max=")
243
        self.assertBadRequest(response)
244

  
245
    @assert_backend_closed
246
    def test_list_images_filters_error_2(self, backend):
247
        response = self.get("/plankton/images/?size_min=foo")
248
        self.assertBadRequest(response)
249

  
250
    @assert_backend_closed
241 251
    def test_update_image(self, backend):
242 252
        db_image = DummyImages.values()[0]
243 253
        response = self.put("/plankton/images/%s" % db_image['id'],

Also available in: Unified diff