Revision c24d4b5f kamaki/clients/test/cyclades.py

b/kamaki/clients/test/cyclades.py
79 79
    dict(name='n1', id=1),
80 80
    dict(name='n2', id=2)]))
81 81
flavor_list = dict(flavors=dict(values=[
82
        dict(id=1, name="C1R1024D20"),
83
        dict(id=2, name="C1R1024D40"),
84
        dict(id=3, name="C1R1028D20")
82
        dict(id=41, name="C1R1024D20"),
83
        dict(id=42, name="C1R1024D40"),
84
        dict(id=43, name="C1R1028D20")
85 85
    ]))
86 86

  
87 87

  
......
290 290
                servers_delete.call_args[0])
291 291

  
292 292
    def test_list_flavors(self):
293
        self.FR.json = vm_list
294 293
        self.FR.json = flavor_list
295 294
        with patch.object(
296 295
                self.C,
......
305 304
            self.assertEqual(self.client.http_client.url, self.url)
306 305
            self.assertEqual(self.client.http_client.path, '/flavors/detail')
307 306

  
308
    """
309 307
    def test_get_flavor_details(self):
310
        r = self.client.get_flavor_details(self.flavorid)
311
        self.assert_dicts_are_equal(self._flavor_details, r)
308
        self.FR.json = dict(flavor=flavor_list['flavors'])
309
        with patch.object(self.C, 'perform_request', return_value=self.FR()):
310
            r = self.client.get_flavor_details(fid)
311
            self.assertEqual(self.client.http_client.url, self.url)
312
            self.assertEqual(
313
                self.client.http_client.path,
314
                '/flavors/%s' % fid)
315
            self.assert_dicts_are_equal(r, flavor_list['flavors'])
312 316

  
317
    """
313 318
    def test_list_images(self):
314 319
        r = self.client.list_images()
315 320
        self.assertTrue(len(r) > 1)

Also available in: Unified diff