Merge pull request #2477 from opottone/develop

Add recognized HTTP headers for S3 metadata. Fixes #2477, #2050.

1 files changed, 20 insertions, 0 deletions

diff --git a/tests/integration/s3/test_key.py b/tests/integration/s3/test_key.py
index 76ebc17f..f7a67b2b 100644
--- a/tests/integration/s3/test_key.py
+++ b/tests/integration/s3/test_key.py
@@ -403,13 +403,33 @@ class S3KeyTest(unittest.TestCase):
         key.set_metadata('Cache-control', u'public, max-age=500')
         key.set_metadata('Test-Plus', u'A plus (+)')
         key.set_metadata('Content-disposition', u'filename=Schöne Zeit.txt')
+        key.set_metadata('Content-Encoding', 'gzip')
+        key.set_metadata('Content-Language', 'de')
+        key.set_metadata('Content-Type', 'application/pdf')
+        self.assertEqual(key.content_type, 'application/pdf')
+        key.set_metadata('X-Robots-Tag', 'all')
+        key.set_metadata('Expires', u'Thu, 01 Dec 1994 16:00:00 GMT')
         key.set_contents_from_string('foo')
 
         check = self.bucket.get_key('test_header_encoding')
+        remote_metadata = check._get_remote_metadata()
 
+        # TODO: investigate whether encoding ' ' as '%20' makes sense
         self.assertEqual(check.cache_control, 'public,%20max-age=500')
+        self.assertEqual(remote_metadata['cache-control'], 'public,%20max-age=500')
         self.assertEqual(check.get_metadata('test-plus'), 'A plus (+)')
         self.assertEqual(check.content_disposition, 'filename=Sch%C3%B6ne%20Zeit.txt')
+        self.assertEqual(remote_metadata['content-disposition'], 'filename=Sch%C3%B6ne%20Zeit.txt')
+        self.assertEqual(check.content_encoding, 'gzip')
+        self.assertEqual(remote_metadata['content-encoding'], 'gzip')
+        self.assertEqual(check.content_language, 'de')
+        self.assertEqual(remote_metadata['content-language'], 'de')
+        self.assertEqual(check.content_type, 'application/pdf')
+        self.assertEqual(remote_metadata['content-type'], 'application/pdf')
+        self.assertEqual(check.x_robots_tag, 'all')
+        self.assertEqual(remote_metadata['x-robots-tag'], 'all')
+        self.assertEqual(check.expires, 'Thu,%2001%20Dec%201994%2016:00:00%20GMT')
+        self.assertEqual(remote_metadata['expires'], 'Thu,%2001%20Dec%201994%2016:00:00%20GMT')
 
         expected = u'filename=Schöne Zeit.txt'
         if six.PY2: