Revision 6a00d7a7

b/kamaki/clients/compute/test.py
130 130
                (200, 204),
131 131
                ({}, {'k': 'v'})):
132 132
            (server_id, command, success, kwargs) = args
133
            self.client.servers_get(*args[:3], **args[3])
133
            self.client.servers_get(*args[:3], **kwargs)
134 134
            vm_str = '/%s' % server_id if server_id else ''
135 135
            cmd_str = '/%s' % command if command else ''
136 136
            self.assertEqual(get.mock_calls[-1], call(
137 137
                '/servers%s%s' % (vm_str, cmd_str),
138 138
                success=success,
139
                **args[3]))
139
                **kwargs))
140 140

  
141 141
    @patch('%s.delete' % rest_pkg, return_value=FR())
142 142
    def test_servers_delete(self, delete):
......
153 153
            self.assertEqual(delete.mock_calls[-1], call(
154 154
                '/servers%s%s' % (vm_str, cmd_str),
155 155
                success=success,
156
                **args[3]))
156
                **kwargs))
157

  
158
    @patch('%s.set_header' % rest_pkg)
159
    @patch('%s.post' % rest_pkg, return_value=FR())
160
    def test_servers_post(self, post, SH):
161
        from json import dumps
162
        vm_id = vm_recv['server']['id']
163
        for args in product(
164
                ('', vm_id),
165
                ('', 'cmd'),
166
                (None, [dict(json="data"), dict(data="json")]),
167
                (202, 204),
168
                ({}, {'k': 'v'})):
169
            (server_id, command, json_data, success, kwargs) = args
170

  
171
            self.client.servers_post(*args[:4], **kwargs)
172
            vm_str = '/%s' % server_id if server_id else ''
173
            cmd_str = '/%s' % command if command else ''
174
            if json_data:
175
                json_data = dumps(json_data)
176
                self.assertEqual(SH.mock_calls[-2:], [
177
                    call('Content-Type', 'application/json'),
178
                    call('Content-Length', len(json_data))])
179
            self.assertEqual(post.mock_calls[-1], call(
180
                '/servers%s%s' % (vm_str, cmd_str),
181
                data=json_data, success=success,
182
                **kwargs))
157 183

  
158 184

  
159 185
class Compute(TestCase):

Also available in: Unified diff