Skip to content

Commit c78bb96

Browse files
committed
fix tests
1 parent a3639b8 commit c78bb96

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

edx_sga/test_settings.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,15 @@
66

77
import os
88

9-
DEFAULT_FILE_STORAGE = "django.core.files.storage.FileSystemStorage"
109
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
10+
STORAGES = {
11+
"default": {
12+
"BACKEND": "django.core.files.storage.FileSystemStorage",
13+
},
14+
"staticfiles": {
15+
"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
16+
},
17+
}
1118
SECRET_KEY = "k(g$9p*x^a=t_lf$%=b*3$$ipg1g0tm!^pws0@g)u+v@&$657n"
1219
DEBUG = True
1320

edx_sga/tests/common.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ class TempfileMixin(unittest.TestCase):
2626
temp_directory = None
2727
default_storage = None
2828
_original_media_root = None
29-
_original_file_storage = None
29+
_original_storages_default = None
3030

3131
@classmethod
3232
def set_up_temp_directory(cls):
3333
"""
3434
Creates a temp directory and fixes Django settings
3535
"""
3636
cls._original_media_root = settings.MEDIA_ROOT
37-
cls._original_file_storage = settings.DEFAULT_FILE_STORAGE
37+
cls._original_storages_default = settings.STORAGES.get("default", {}).copy()
3838
cls.temp_directory = mkdtemp()
3939
settings.MEDIA_ROOT = cls.temp_directory
40-
settings.DEFAULT_FILE_STORAGE = "django.core.files.storage.FileSystemStorage"
40+
settings.STORAGES["default"] = {"BACKEND": "django.core.files.storage.FileSystemStorage"}
4141
cls.default_storage = default_storage
4242

4343
@classmethod
@@ -47,9 +47,9 @@ def tear_down_temp_directory(cls):
4747
"""
4848
shutil.rmtree(cls.temp_directory, ignore_errors=True)
4949
settings.MEDIA_ROOT = cls._original_media_root
50-
settings.DEFAULT_FILE_STORAGE = cls._original_file_storage
50+
settings.STORAGES["default"] = cls._original_storages_default
5151
del cls._original_media_root
52-
del cls._original_file_storage
52+
del cls._original_storages_default
5353

5454
@contextmanager
5555
def dummy_upload(self, filename, data=b"some information"):

0 commit comments

Comments
 (0)