Revision 03493855 kamaki/clients/test/image.py

b/kamaki/clients/test/image.py
128 128

  
129 129
class Image(TestCase):
130 130

  
131
    def assert_dicts_are_deeply_equal(self, d1, d2):
132
        for k, v in d1.items():
133
            self.assertTrue(k in d2)
134
            if isinstance(v, dict):
135
                self.assert_dicts_are_deeply_equal(v, d2[k])
136
            else:
137
                self.assertEqual(unicode(v), unicode(d2[k]))
138

  
131 139
    class FR(object):
132 140
        json = example_images
133 141
        headers = {}
......
139 147
            pass
140 148

  
141 149
    def setUp(self):
142
        self.imgname = 'img_%s' % self.now
143 150
        self.url = 'http://image.example.com'
144 151
        self.token = 'an1m@g370k3n=='
145 152
        from kamaki.clients.image import ImageClient
146 153
        self.client = ImageClient(self.url, self.token)
147
        self.cyclades_url = 'http://cyclades.example.com'
148
        from kamaki.clients.cyclades import CycladesClient
149
        self.cyclades = CycladesClient(self.cyclades_url, self.token)
150 154
        from kamaki.clients.connection.kamakicon import KamakiHTTPConnection
151 155
        self.C = KamakiHTTPConnection
152 156

  
......
154 158
        self.FR.json = example_images
155 159
        self.FR.status_code = 200
156 160

  
157
    def assert_dicts_are_deeply_equal(self, d1, d2):
158
        for k, v in d1.items():
159
            self.assertTrue(k in d2)
160
            if isinstance(v, dict):
161
                self.assert_dicts_are_deeply_equal(v, d2[k])
162
            else:
163
                self.assertEqual(unicode(v), unicode(d2[k]))
164

  
165 161
    def test_list_public(self):
166 162
        with patch.object(
167 163
            self.C,

Also available in: Unified diff