wassname/flask-s3
1
0
Fork 0
mirror of https://github.com/wassname/flask-s3.git synced 2026-08-15 12:24:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix requirement in docs/requirements.txt, fix test

Browse Source
This commit is contained in:
Franklyn Tackitt
2015-08-21 10:56:08 -07:00
parent e39fc3e3ed
commit 5281633ba5
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/requirements.txt
+1 -1
View File
@@ -1,5 +1,5 @@
Flask==0.9
Jinja2==2.6
Werkzeug==0.8.3
boto==2.29.1
boto3==1.1.1
wsgiref==0.1.2
tests/test_flask_static.py
+15 -15
View File
@@ -3,8 +3,6 @@ import ntpath
import tempfile
import os
import pprint
from mock import Mock, patch, call, mock_open
from flask import Flask, render_template_string, Blueprint
@@ -237,7 +235,7 @@ class S3Tests(unittest.TestCase):
self.assertEquals(exp, actual)
@patch('flask_s3.boto3')
@patch('flask_s3.open', mock_open(read_data='test'))
@patch('__builtin__.open', mock_open(read_data='test'))
def test__write_files(self, key_mock):
""" Tests _write_files """
static_url_loc = '/foo/static'
@@ -278,12 +276,12 @@ class S3Tests(unittest.TestCase):
f.write(data)
# We expect each file to be uploaded
expected.extend([call.put_object(ACL='public-read',
Metadata={'Expires': 'Thu, 31 Dec 2037 23:59:59 GMT',
'Content-Encoding': 'gzip'},
Bucket=None,
Key=filename,
Body=data)])
expected.append(call.put_object(ACL='public-read',
Metadata={'Expires': 'Thu, 31 Dec 2037 23:59:59 GMT',
'Content-Encoding': 'gzip'},
Bucket=None,
Key=filename.lstrip("/"),
Body=data))
files = {(static_url_loc, static_folder): filenames}
@@ -299,16 +297,18 @@ class S3Tests(unittest.TestCase):
f.write(data)
# We expect only this file to be uploaded
expected.extend([call.put_object(ACL='public-read',
Metadata={'Expires': 'Thu, 31 Dec 2037 23:59:59 GMT',
'Content-Encoding': 'gzip'},
Bucket=None,
Key=filenames[1],
Body=data)])
expected.append(call.put_object(ACL='public-read',
Metadata={'Expires': 'Thu, 31 Dec 2037 23:59:59 GMT',
'Content-Encoding': 'gzip'},
Bucket=None,
Key=filenames[1].lstrip("/"),
Body=data))
new_hashes = flask_s3._upload_files(key_mock, self.app, files, None,
hashes=dict(hashes))
import pprint
pprint.pprint(zip(expected, key_mock.mock_calls))
self.assertEqual(expected, key_mock.mock_calls)
def test_static_folder_path(self):