diff options
Diffstat (limited to 'tests/integration/s3/test_bucket.py')
| -rw-r--r-- | tests/integration/s3/test_bucket.py | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/tests/integration/s3/test_bucket.py b/tests/integration/s3/test_bucket.py index f09d07ff..84951440 100644 --- a/tests/integration/s3/test_bucket.py +++ b/tests/integration/s3/test_bucket.py @@ -26,6 +26,7 @@ Some unit tests for the S3 Bucket """ +from mock import patch, Mock import unittest import time @@ -39,6 +40,7 @@ from boto.s3.lifecycle import Rule from boto.s3.acl import Grant from boto.s3.tagging import Tags, TagSet from boto.s3.website import RedirectLocation +from boto.compat import urllib class S3BucketTest (unittest.TestCase): @@ -86,6 +88,23 @@ class S3BucketTest (unittest.TestCase): self.assertEqual(element.name, expected.pop(0)) self.assertEqual(expected, []) + def test_list_with_url_encoding(self): + expected = ["α", "β", "γ"] + for key_name in expected: + key = self.bucket.new_key(key_name) + key.set_contents_from_string(key_name) + + # ensure bucket.list() still works by just + # popping elements off the front of expected. + orig_getall = self.bucket._get_all + getall = lambda *a, **k: orig_getall(*a, max_keys=2, **k) + with patch.object(self.bucket, '_get_all', getall): + rs = self.bucket.list(encoding_type="url") + for element in rs: + name = urllib.parse.unquote(element.name.encode('utf-8')) + self.assertEqual(name, expected.pop(0)) + self.assertEqual(expected, []) + def test_logging(self): # use self.bucket as the target bucket so that teardown # will delete any log files that make it into the bucket |