Revision 7b6e977c kamaki/clients/livetest/image.py

b/kamaki/clients/livetest/image.py
39 39
from kamaki.clients import ClientError
40 40

  
41 41

  
42
IMGMETA = set([
43
    'id', 'name', 'checksum', 'container-format', 'location', 'disk-format',
44
    'is-public', 'status', 'deleted-at', 'updated-at', 'created-at', 'owner',
45
    'size'])
46

  
47

  
42 48
class Image(livetest.Generic):
43 49
    def setUp(self):
44 50
        self.now = time.mktime(time.gmtime())
......
49 55
        cyclades_url = self['compute', 'url']
50 56
        self.cyclades = CycladesClient(cyclades_url, self['token'])
51 57
        self._imglist = {}
58
        self._imgdetails = {}
52 59

  
53 60
    def test_000(self):
54 61
        self._prepare_img()
......
73 80
        print('\t- ok')
74 81
        f.close()
75 82

  
76
        self.client.register(
83
        r = self.client.register(
77 84
            self.imgname,
78 85
            self.location,
79 86
            params=dict(is_public=True))
80
        img = self._get_img_by_name(self.imgname)
81
        self._imglist[self.imgname] = img
87
        self._imglist[self.imgname] = dict(
88
            name=r['x-image-meta-name'], id=r['x-image-meta-id'])
89
        self._imgdetails[self.imgname] = r
82 90

  
83 91
    def tearDown(self):
84 92
        for img in self._imglist.values():
......
200 208
        self.assertTrue(self._imglist)
201 209
        for img in self._imglist.values():
202 210
            self.assertTrue(img is not None)
211
            r = set(self._imgdetails[img['name']].keys())
212
            self.assertTrue(
213
                r.issubset(['x-image-meta-%s' % k for k in IMGMETA]))
203 214

  
204 215
    def test_set_members(self):
205 216
        """Test set_members"""

Also available in: Unified diff