catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Get standalone server mode working for all tests.

Browse source
This commit is contained in:
Steve Pulec 2017-02-23 19:43:48 -05:00
commit 81836b6981
78 changed files with 957 additions and 783 deletions
Download patch file Download diff file Expand all files Collapse all files

2
moto/s3/__init__.py
View file

@ -1,4 +1,6 @@
from __future__ import unicode_literals
from .models import s3_backend
s3_backends = {"global": s3_backend}
mock_s3 = s3_backend.decorator
mock_s3_deprecated = s3_backend.deprecated_decorator

10
moto/s3/models.py
View file

@ -89,21 +89,21 @@ class FakeKey(object):
@property
def response_dict(self):
r = {
res = {
'etag': self.etag,
'last-modified': self.last_modified_RFC1123,
'content-length': str(len(self.value)),
}
if self._storage_class != 'STANDARD':
r['x-amz-storage-class'] = self._storage_class
res['x-amz-storage-class'] = self._storage_class
if self._expiry is not None:
rhdr = 'ongoing-request="false", expiry-date="{0}"'
r['x-amz-restore'] = rhdr.format(self.expiry_date)
res['x-amz-restore'] = rhdr.format(self.expiry_date)
if self._is_versioned:
r['x-amz-version-id'] = str(self._version_id)
res['x-amz-version-id'] = str(self._version_id)
return r
return res
@property
def size(self):