Merge lp:~rackspace-titan/glance/multiple-content-types-lp800947 into lp:~hudson-openstack/glance/trunk

[Brian Waldon]

Explicitly set headers rather than add them

[Mark Washenberger (markwash)]

This looks good to me, and I believe it will fix the one failing test in the functional test merge prop. However, I would like to see that same failure (or rather the fact that it should succeed in this branch!) documented in some unit tests as well. :-)

[lp:~rackspace-titan/glance/multiple-content-types-lp800947]

144. By Brian Waldon on 2011-06-24

adding assert to check content_type in GET /images/<id> test

[Brian Waldon (bcwaldon)]

Check it now. I added an assert, merged in trunk (the httplib2 branch), and updated the problem test.

[lp:~rackspace-titan/glance/multiple-content-types-lp800947]

145. By Brian Waldon on 2011-06-24

merging trunk

146. By Brian Waldon on 2011-06-24

fixing httplib2 functional test that was expecting wrong content-type value

[Mark Washenberger (markwash)]

Cool.

review: Approve

[Jay Pipes (jaypipes)]

lgtm.

review: Approve

=== modified file 'glance/api/v1/images.py'
--- glance/api/v1/images.py	2011-06-17 20:45:45 +0000
+++ glance/api/v1/images.py	2011-06-24 21:18:33 +0000
@@ -525,10 +525,10 @@
 
     def _inject_location_header(self, response, image_meta):
         location = self._get_image_location(image_meta)
-        response.headers.add('Location', location)
+        response.headers['Location'] = location
 
     def _inject_checksum_header(self, response, image_meta):
-        response.headers.add('ETag', image_meta['checksum'])
+        response.headers['ETag'] = image_meta['checksum']
 
     def _inject_image_meta_headers(self, response, image_meta):
         """
@@ -545,7 +545,7 @@
         headers = utils.image_meta_to_http_headers(image_meta)
 
         for k, v in headers.items():
-            response.headers.add(k, v)
+            response.headers[k] = v
 
     def _get_image_location(self, image_meta):
         """Build a relative url to reach the image defined by image_meta."""
@@ -563,8 +563,8 @@
 
         response.app_iter = result['image_iterator']
         # Using app_iter blanks content-length, so we set it here...
-        response.headers.add('Content-Length', image_meta['size'])
-        response.headers.add('Content-Type', 'application/octet-stream')
+        response.headers['Content-Length'] = image_meta['size']
+        response.headers['Content-Type'] = 'application/octet-stream'
 
         self._inject_image_meta_headers(response, image_meta)
         self._inject_location_header(response, image_meta)
@@ -575,7 +575,7 @@
     def update(self, response, result):
         image_meta = result['image_meta']
         response.body = self.to_json(dict(image=image_meta))
-        response.headers.add('Content-Type', 'application/json')
+        response.headers['Content-Type'] = 'application/json'
         self._inject_location_header(response, image_meta)
         self._inject_checksum_header(response, image_meta)
         return response
@@ -583,7 +583,7 @@
     def create(self, response, result):
         image_meta = result['image_meta']
         response.status = httplib.CREATED
-        response.headers.add('Content-Type', 'application/json')
+        response.headers['Content-Type'] = 'application/json'
         response.body = self.to_json(dict(image=image_meta))
         self._inject_location_header(response, image_meta)
         self._inject_checksum_header(response, image_meta)

=== modified file 'tests/functional/test_httplib2_api.py'
--- tests/functional/test_httplib2_api.py	2011-06-22 18:04:19 +0000
+++ tests/functional/test_httplib2_api.py	2011-06-24 21:18:33 +0000
@@ -135,8 +135,7 @@
 
         expected_std_headers = {
             'content-length': str(FIVE_KB),
-            'content-type':
-                'text/html; charset=UTF-8, application/octet-stream'}
+            'content-type': 'application/octet-stream'}
 
         for expected_key, expected_value in expected_image_headers.items():
             self.assertEqual(response[expected_key], expected_value,

=== modified file 'tests/unit/test_api.py'
--- tests/unit/test_api.py	2011-06-21 16:31:54 +0000
+++ tests/unit/test_api.py	2011-06-24 21:18:33 +0000
@@ -1148,6 +1148,8 @@
     def test_show_image_basic(self):
         req = webob.Request.blank("/images/2")
         res = req.get_response(self.api)
+        self.assertEqual(res.status_int, 200)
+        self.assertEqual(res.content_type, 'application/octet-stream')
         self.assertEqual('chunk00000remainder', res.body)
 
     def test_show_non_exists_image(self):