Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

For S3 Key Head requests, just return the real body for now so that key length works. Closes #131.

Browse Source
This commit is contained in:
Steve Pulec 2014-11-19 21:06:23 -05:00
parent 8954242086
commit 8d6868f9d3
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moto/s3/responses.py
View File

@ -346,7 +346,7 @@ class ResponseObject(object):
if key: if key:
headers.update(key.metadata) headers.update(key.metadata)
headers.update(key.response_dict) headers.update(key.response_dict)
return 200, headers, "" return 200, headers, key.value
else: else:
return 404, headers, "" return 404, headers, ""

11
tests/test_s3/test_s3.py
View File

@ -1,5 +1,4 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import six
from six.moves.urllib.request import urlopen from six.moves.urllib.request import urlopen
from six.moves.urllib.error import HTTPError from six.moves.urllib.error import HTTPError
from io import BytesIO from io import BytesIO
@ -10,7 +9,7 @@ from boto.s3.connection import S3Connection
from boto.s3.key import Key from boto.s3.key import Key
from freezegun import freeze_time from freezegun import freeze_time
import requests import requests
import tests.backport_assert_raises import tests.backport_assert_raises # noqa
from nose.tools import assert_raises from nose.tools import assert_raises
import sure # noqa import sure # noqa
@ -187,7 +186,9 @@ def test_empty_key():
key.key = "the-key" key.key = "the-key"
key.set_contents_from_string("") key.set_contents_from_string("")
bucket.get_key("the-key").get_contents_as_string().should.equal(b'') key = bucket.get_key("the-key")
key.size.should.equal(0)
key.get_contents_as_string().should.equal(b'')
@mock_s3 @mock_s3
@ -198,7 +199,9 @@ def test_empty_key_set_on_existing_key():
key.key = "the-key" key.key = "the-key"
key.set_contents_from_string("foobar") key.set_contents_from_string("foobar")
bucket.get_key("the-key").get_contents_as_string().should.equal(b'foobar') key = bucket.get_key("the-key")
key.size.should.equal(6)
key.get_contents_as_string().should.equal(b'foobar')
key.set_contents_from_string("") key.set_contents_from_string("")
bucket.get_key("the-key").get_contents_as_string().should.equal(b'') bucket.get_key("the-key").get_contents_as_string().should.equal(b'')