1
=== modified file 'src/apiclient/maas_client.py'
2
--- src/apiclient/maas_client.py	2013-12-03 07:55:27 +0000
3
+++ src/apiclient/maas_client.py	2014-04-29 07:01:28 +0000
4
@@ -1,4 +1,4 @@
6
1
# Copyright 2012 Canonical Ltd.  This software is licensed under the
1
# Copyright 2012-2014 Canonical Ltd.  This software is licensed under the
7
2
# GNU Affero General Public License version 3 (see the file LICENSE).
2
# GNU Affero General Public License version 3 (see the file LICENSE).
8
3
3
9
4
"""MAAS OAuth API connection library."""
4
"""MAAS OAuth API connection library."""
10
@@ -240,5 +240,7 @@
11
240
    def delete(self, path):
240
    def delete(self, path):
12
241
        """Dispatch a DELETE on the resource at `path`."""
241
        """Dispatch a DELETE on the resource at `path`."""
13
242
        url, headers, body = self._formulate_change(path, {})
242
        url, headers, body = self._formulate_change(path, {})
14
243
        # The body will be empty, but it must be passed.  Otherwise, the
15
244
        # request will hang while trying to read a response (bug 1313556).
16
243
        return self.dispatcher.dispatch_query(
245
        return self.dispatcher.dispatch_query(
18
244
            url, method="DELETE", headers=headers)
246
            url, method="DELETE", headers=headers, data=body)
19
245
247
20
=== modified file 'src/apiclient/tests/test_maas_client.py'
21
--- src/apiclient/tests/test_maas_client.py	2013-12-03 07:55:27 +0000
22
+++ src/apiclient/tests/test_maas_client.py	2014-04-29 07:01:28 +0000
23
@@ -1,4 +1,4 @@
25
1
# Copyright 2012, 2013 Canonical Ltd.  This software is licensed under the
1
# Copyright 2012-2014 Canonical Ltd.  This software is licensed under the
26
2
# GNU Affero General Public License version 3 (see the file LICENSE).
2
# GNU Affero General Public License version 3 (see the file LICENSE).
27
3
3
28
4
"""Test MAAS HTTP API client."""
4
"""Test MAAS HTTP API client."""
29
@@ -346,3 +346,10 @@
30
346
        self.assertEqual(client._make_url(path), request['request_url'])
346
        self.assertEqual(client._make_url(path), request['request_url'])
31
347
        self.assertIn('Authorization', request['headers'])
347
        self.assertIn('Authorization', request['headers'])
32
348
        self.assertEqual('DELETE', request['method'])
348
        self.assertEqual('DELETE', request['method'])
33
349
34
350
    def test_delete_passes_body(self):
35
351
        # A DELETE request should have an empty body.  But we can't just leave
36
352
        # the body out altogether, or the request will hang (bug 1313556).
37
353
        client = make_client()
38
354
        client.delete(make_path())
39
355
        self.assertIsNotNone(client.dispatcher.last_call['data'])
Reviewer	Review Type	Date Requested	Status
Jeroen T. Vermeulen (community)			Approve on 2014-04-29
Review via email: mp+217545@code.launchpad.net