mirror of https://github.com/django/django.git
Refs #28428 -- Added tests for using FileSystemStorage with pathlib.Path.
This commit is contained in:
parent
377c7cb2f7
commit
0f2975534d
|
@ -7,6 +7,7 @@ import time
|
|||
import unittest
|
||||
from datetime import datetime, timedelta
|
||||
from io import StringIO
|
||||
from pathlib import Path
|
||||
from urllib.request import urlopen
|
||||
|
||||
from django.core.cache import cache
|
||||
|
@ -371,14 +372,15 @@ class FileStorageTests(SimpleTestCase):
|
|||
self.storage.save('storage_test_2', ContentFile('custom content'))
|
||||
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.addCleanup(self.storage.delete, 'storage_test_2')
|
||||
|
||||
for directory in ('', Path('')):
|
||||
with self.subTest(directory=directory):
|
||||
dirs, files = self.storage.listdir(directory)
|
||||
self.assertEqual(set(dirs), {'storage_dir_1'})
|
||||
self.assertEqual(set(files), {'storage_test_1', 'storage_test_2'})
|
||||
|
||||
self.storage.delete('storage_test_1')
|
||||
self.storage.delete('storage_test_2')
|
||||
os.rmdir(os.path.join(self.temp_dir, 'storage_dir_1'))
|
||||
|
||||
def test_file_storage_prevents_directory_traversal(self):
|
||||
"""
|
||||
File storage prevents directory traversal (files can only be accessed if
|
||||
|
@ -539,6 +541,19 @@ class FileStorageTests(SimpleTestCase):
|
|||
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):
|
||||
def get_available_name(self, name, max_length=None):
|
||||
|
|
Loading…
Reference in New Issue