summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDaniel G. Taylor <dan@programmer-art.org>2014-07-30 14:19:36 -0700
committerDaniel G. Taylor <dan@programmer-art.org>2014-07-30 14:19:36 -0700
commitf3eb4cd6e25a5b7a957b8a2e05fbb8d17449527a (patch)
tree66d1f6ae83a70b170964e04a2e8fe03002e4452b /tests
parent71b795a31635c929c626bc3ee59e307e4487e624 (diff)
parent82b79e3e06f215e7bc13a958c956944c1dc45e50 (diff)
downloadboto-f3eb4cd6e25a5b7a957b8a2e05fbb8d17449527a.tar.gz
Merge pull request #2466 from danielgtaylor/s3-integ-fix
Fix S3 integ test on Py3. Fixes #2466.
Diffstat (limited to 'tests')
-rw-r--r--tests/integration/s3/test_key.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/integration/s3/test_key.py b/tests/integration/s3/test_key.py
index 930966d9..76ebc17f 100644
--- a/tests/integration/s3/test_key.py
+++ b/tests/integration/s3/test_key.py
@@ -438,4 +438,4 @@ class S3KeyTest(unittest.TestCase):
k.set_contents_from_string(content, headers=header)
kn = self.bucket.new_key("testkey_for_sse_c")
ks = kn.get_contents_as_string(headers=header)
- self.assertEqual(ks, content)
+ self.assertEqual(ks, content.encode('utf-8'))