p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refs #28428 -- Added tests for using FileSystemStorage with pathlib.Path.

This commit is contained in:
Hasan Ramezani 2019-10-31 08:51:12 +01:00 committed by Mariusz Felisiak
parent 377c7cb2f7
commit 0f2975534d
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/file_storage/tests.py
View File

@ -7,6 +7,7 @@ import time
import unittest import unittest
from datetime import datetime, timedelta from datetime import datetime, timedelta
from io import StringIO from io import StringIO
from pathlib import Path
from urllib.request import urlopen from urllib.request import urlopen
from django.core.cache import cache from django.core.cache import cache
@ -371,13 +372,14 @@ class FileStorageTests(SimpleTestCase):
self.storage.save('storage_test_2', ContentFile('custom content')) self.storage.save('storage_test_2', ContentFile('custom content'))
os.mkdir(os.path.join(self.temp_dir, 'storage_dir_1')) os.mkdir(os.path.join(self.temp_dir, 'storage_dir_1'))
dirs, files = self.storage.listdir('') self.addCleanup(self.storage.delete, 'storage_test_1')
self.assertEqual(set(dirs), {'storage_dir_1'}) self.addCleanup(self.storage.delete, 'storage_test_2')
self.assertEqual(set(files), {'storage_test_1', 'storage_test_2'})
self.storage.delete('storage_test_1') for directory in ('', Path('')):
self.storage.delete('storage_test_2') with self.subTest(directory=directory):
os.rmdir(os.path.join(self.temp_dir, 'storage_dir_1')) dirs, files = self.storage.listdir(directory)
self.assertEqual(set(dirs), {'storage_dir_1'})
self.assertEqual(set(files), {'storage_test_1', 'storage_test_2'})
def test_file_storage_prevents_directory_traversal(self): def test_file_storage_prevents_directory_traversal(self):
""" """
@ -539,6 +541,19 @@ class FileStorageTests(SimpleTestCase):
defaults_storage.directory_permissions_mode, settings['FILE_UPLOAD_DIRECTORY_PERMISSIONS'] defaults_storage.directory_permissions_mode, settings['FILE_UPLOAD_DIRECTORY_PERMISSIONS']
) )
def test_file_methods_pathlib_path(self):
p = Path('test.file')
self.assertFalse(self.storage.exists(p))
f = ContentFile('custom contents')
f_name = self.storage.save(str(p), f)
# Storage basic methods.
self.assertEqual(self.storage.path(p), os.path.join(self.temp_dir, p))
self.assertEqual(self.storage.size(p), 15)
self.assertEqual(self.storage.url(p), self.storage.base_url + f_name)
with self.storage.open(p) as f:
self.assertEqual(f.read(), b'custom contents')
self.addCleanup(self.storage.delete, p)
class CustomStorage(FileSystemStorage): class CustomStorage(FileSystemStorage):
def get_available_name(self, name, max_length=None): def get_available_name(self, name, max_length=None):