Revision 17b255c7 kamaki/clients/livetest/image.py

b/kamaki/clients/livetest/image.py
85 85
            self.location,
86 86
            params=dict(is_public=True))
87 87
        self._imglist[self.imgname] = dict(
88
            name=r['x-image-meta-name'], id=r['x-image-meta-id'])
88
            name=r['name'], id=r['id'])
89 89
        self._imgdetails[self.imgname] = r
90 90

  
91 91
    def tearDown(self):
......
154 154
                    'properties',
155 155
                    'size'):
156 156
                self.assertTrue(term in img)
157
                if img['properties']:
157
                if len(img['properties']):
158 158
                    for interm in ('osfamily', 'users', 'root_partition'):
159 159
                        self.assertTrue(interm in img['properties'])
160 160
        size_max = 1000000000
......
185 185
                'container-format'):
186 186
            self.assertTrue(term in r)
187 187
            for interm in (
188
                    'kernel',
189
                    'osfamily',
190
                    'users',
191
                    'gui', 'sortorder',
192
                    'root-partition',
193
                    'os',
194
                    'description'):
188
                    'KERNEL',
189
                    'OSFAMILY',
190
                    'USERS',
191
                    'GUI',
192
                    'SORTORDER',
193
                    'ROOT_PARTITION',
194
                    'OS',
195
                    'DESCRIPTION'):
195 196
                self.assertTrue(interm in r['properties'])
196 197

  
197 198
    def test_register(self):
......
204 205
        for img in self._imglist.values():
205 206
            self.assertTrue(img is not None)
206 207
            r = set(self._imgdetails[img['name']].keys())
207
            self.assertTrue(
208
                r.issubset(['x-image-meta-%s' % k for k in IMGMETA]))
208
            self.assertTrue(r.issubset(IMGMETA.union(['properties'])))
209 209

  
210 210
    def test_unregister(self):
211 211
        """Test unregister"""

Also available in: Unified diff