Revision b3efa972

b/kamaki/clients/test/cyclades.py
35 35
from json import loads
36 36

  
37 37
from kamaki.clients import Client, ClientError
38
from kamaki.clients.cyclades import CycladesClient
38 39
from kamaki.clients.cyclades_rest_api import CycladesClientApi
39 40

  
40 41
img_ref = "1m4g3-r3f3r3nc3"
......
118 119
    def setUp(self):
119 120
        self.url = 'http://cyclades.example.com'
120 121
        self.token = 'cyc14d3s70k3n'
121
        from kamaki.clients.cyclades import CycladesClient
122 122
        self.client = CycladesClient(self.url, self.token)
123 123
        from kamaki.clients.connection.kamakicon import KamakiHTTPConnection
124 124
        self.C = KamakiHTTPConnection
......
345 345
                '/images/%s' % img_ref)
346 346
            self.assert_dicts_are_equal(r, img_recv['image'])
347 347

  
348
    """
349
    def test_get_image_details(self):
350
        r = self.client.get_image_details(self.img)
351
        self.assert_dicts_are_equal(r, self.img_details)
352

  
353 348
    def test_get_image_metadata(self):
354
        r = self.client.get_image_metadata(self.img)
355
        self.assert_dicts_are_equal(
356
            self.img_details['metadata']['values'], r)
357
        for key, val in self.img_details['metadata']['values'].items():
358
            r = self.client.get_image_metadata(self.img, key)
359
            self.assertEqual(r[key], val)
349
        self.FR.json = dict(metadata=dict(values=img_recv['image']))
350
        with patch.object(
351
                CycladesClient,
352
                'images_get',
353
                return_value=self.FR()) as inner:
354
            r = self.client.get_image_metadata(img_ref)
355
            self.assertEqual(inner.call_args[0], ('%s' % img_ref, '/meta'))
356
            self.assert_dicts_are_equal(img_recv['image'], r)
357
            self.FR.json = dict(meta=img_recv['image'])
358
            key = 'somekey'
359
            self.client.get_image_metadata(img_ref, key)
360
            self.assertEqual(
361
                inner.call_args[0],
362
                ('%s' % img_ref, '/meta/%s' % key))
360 363

  
364
    """
361 365
    def test_shutdown_server(self):
362 366
        self.client.shutdown_server(self.server1['id'])
363 367
        self._wait_for_status(self.server1['id'], 'ACTIVE')

Also available in: Unified diff