From 887b6bbe0393df6884c62aff3bd1be56ec186052 Mon Sep 17 00:00:00 2001
From: zhengxie <xiez1989@gmail.com>
Date: Fri, 6 Nov 2015 14:19:29 +0800
Subject: [PATCH] Fix tests and replace mimetype with content_type

---
 pytest.ini                |  2 +-
 requirements.txt          |  3 ++-
 seahub/test_settings.py   | 17 +++++++++++++++++
 seahub/thumbnail/views.py |  6 ++++--
 seahub/views/__init__.py  |  2 +-
 test-requirements.txt     |  2 ++
 6 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 seahub/test_settings.py

diff --git a/pytest.ini b/pytest.ini
index 5de713cf6f..9ea71d56fe 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,4 +1,4 @@
 [pytest]
 python_files=test_*.py tests.py
 addopts = -s -v
-DJANGO_SETTINGS_MODULE=seahub.settings
+DJANGO_SETTINGS_MODULE=seahub.test_settings
diff --git a/requirements.txt b/requirements.txt
index d43e8f2589..1579fe9415 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,10 @@
 python-dateutil
+python-memcached==1.57
 chardet
 six
 Pillow>=2.6.1,<3.0.0
 Django==1.8.5
-Djblets==0.8.22
+#Djblets==0.8.22
 django-compressor==1.4
 django-statici18n==1.1.2
 git+git://github.com/haiwen/django-constance.git@bde7f7cdfd0ed1631a6817fd4cd76f37bf54fe35#egg=django-constance[database]
diff --git a/seahub/test_settings.py b/seahub/test_settings.py
new file mode 100644
index 0000000000..fe69d987ba
--- /dev/null
+++ b/seahub/test_settings.py
@@ -0,0 +1,17 @@
+from .settings import *
+
+# no cache for testing
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
+    }
+}
+
+# enlarge api throttle
+REST_FRAMEWORK = {
+    'DEFAULT_THROTTLE_RATES': {
+        'ping': '600/minute',
+        'anon': '5000/minute',
+        'user': '300/minute',
+    },
+}
diff --git a/seahub/thumbnail/views.py b/seahub/thumbnail/views.py
index d861e0b4d1..e94c5fc836 100644
--- a/seahub/thumbnail/views.py
+++ b/seahub/thumbnail/views.py
@@ -111,7 +111,8 @@ def thumbnail_get(request, repo_id, size, path):
         try:
             with open(thumbnail_file, 'rb') as f:
                 thumbnail = f.read()
-            return HttpResponse(content=thumbnail, mimetype='image/'+THUMBNAIL_EXTENSION)
+            return HttpResponse(content=thumbnail,
+                                content_type='image/' + THUMBNAIL_EXTENSION)
         except IOError as e:
             logger.error(e)
             return HttpResponse()
@@ -234,7 +235,8 @@ def share_link_thumbnail_get(request, token, size, path):
         try:
             with open(thumbnail_file, 'rb') as f:
                 thumbnail = f.read()
-            return HttpResponse(content=thumbnail, mimetype='image/'+THUMBNAIL_EXTENSION)
+            return HttpResponse(content=thumbnail,
+                                content_type='image/' + THUMBNAIL_EXTENSION)
         except IOError as e:
             logger.error(e)
             return HttpResponse()
diff --git a/seahub/views/__init__.py b/seahub/views/__init__.py
index 4bb85d4a1c..a4b7a9f370 100644
--- a/seahub/views/__init__.py
+++ b/seahub/views/__init__.py
@@ -2025,7 +2025,7 @@ def image_view(request, filename):
 
     # Prepare response
     content_type, content_encoding = mimetypes.guess_type(filename)
-    response = HttpResponse(content=file_content, mimetype=content_type)
+    response = HttpResponse(content=file_content, content_type=content_type)
     response['Content-Disposition'] = 'inline; filename=%s' % filename
     if content_encoding:
         response['Content-Encoding'] = content_encoding
diff --git a/test-requirements.txt b/test-requirements.txt
index cffdceee3e..4d2596ed80 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,3 +1,5 @@
+mock==1.0.1
+nose==1.3.7
 exam==0.10.5
 splinter==0.7.2
 requests==2.3.0