summaryrefslogtreecommitdiff
path: root/tests/file_storage
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-04-07 22:04:45 -0400
committerTim Graham <timograham@gmail.com>2016-04-08 10:12:33 -0400
commit92053acbb9160862c3e743a99ed8ccff8d4f8fd6 (patch)
tree50e7fd28a650f0e2352cf94f92e5a66d28a81988 /tests/file_storage
parentdf8d8d4292684d6ffa7474f1e201aed486f02b53 (diff)
Fixed E128 flake8 warnings in tests/.
Diffstat (limited to 'tests/file_storage')
-rw-r--r--tests/file_storage/tests.py47
1 files changed, 18 insertions, 29 deletions
diff --git a/tests/file_storage/tests.py b/tests/file_storage/tests.py
index e027d51249..d1ea0021c5 100644
--- a/tests/file_storage/tests.py
+++ b/tests/file_storage/tests.py
@@ -69,10 +69,8 @@ class GetStorageClassTests(SimpleTestCase):
get_storage_class raises an error if the requested module don't exist.
"""
# Error message may or may not be the fully qualified path.
- with six.assertRaisesRegex(self, ImportError,
- "No module named '?(django.core.files.)?non_existing_storage'?"):
- get_storage_class(
- 'django.core.files.non_existing_storage.NonExistingStorage')
+ with six.assertRaisesRegex(self, ImportError, "No module named '?(django.core.files.)?non_existing_storage'?"):
+ get_storage_class('django.core.files.non_existing_storage.NonExistingStorage')
class FileStorageDeconstructionTests(unittest.TestCase):
@@ -103,8 +101,7 @@ class FileStorageTests(TestCase):
def setUp(self):
self.temp_dir = tempfile.mkdtemp()
- self.storage = self.storage_class(location=self.temp_dir,
- base_url='/test_media_url/')
+ self.storage = self.storage_class(location=self.temp_dir, base_url='/test_media_url/')
# Set up a second temporary directory which is ensured to have a mixed
# case name.
self.temp_dir2 = tempfile.mkdtemp(suffix='aBc')
@@ -345,8 +342,7 @@ class FileStorageTests(TestCase):
Saving a pathname should create intermediate directories as necessary.
"""
self.assertFalse(self.storage.exists('path/to'))
- self.storage.save('path/to/test.file',
- ContentFile('file saved with path'))
+ self.storage.save('path/to/test.file', ContentFile('file saved with path'))
self.assertTrue(self.storage.exists('path/to'))
with self.storage.open('path/to/test.file') as f:
@@ -366,8 +362,7 @@ class FileStorageTests(TestCase):
self.assertFalse(file.closed)
self.assertFalse(file.file.closed)
- file = InMemoryUploadedFile(six.StringIO('1'), '', 'test',
- 'text/plain', 1, 'utf8')
+ file = InMemoryUploadedFile(six.StringIO('1'), '', 'test', 'text/plain', 1, 'utf8')
with file:
self.assertFalse(file.closed)
self.storage.save('path/to/test.file', file)
@@ -383,8 +378,7 @@ class FileStorageTests(TestCase):
f = ContentFile('custom contents')
f_name = self.storage.save('test.file', f)
- self.assertEqual(self.storage.path(f_name),
- os.path.join(self.temp_dir, f_name))
+ self.assertEqual(self.storage.path(f_name), os.path.join(self.temp_dir, f_name))
self.storage.delete(f_name)
@@ -392,18 +386,18 @@ class FileStorageTests(TestCase):
"""
File storage returns a url to access a given file from the Web.
"""
- self.assertEqual(self.storage.url('test.file'),
- '%s%s' % (self.storage.base_url, 'test.file'))
+ self.assertEqual(self.storage.url('test.file'), self.storage.base_url + 'test.file')
# should encode special chars except ~!*()'
# like encodeURIComponent() JavaScript function do
- self.assertEqual(self.storage.url(r"""~!*()'@#$%^&*abc`+ =.file"""),
- """/test_media_url/~!*()'%40%23%24%25%5E%26*abc%60%2B%20%3D.file""")
- self.assertEqual(self.storage.url("""ab\0c"""), """/test_media_url/ab%00c""")
+ self.assertEqual(
+ self.storage.url(r"~!*()'@#$%^&*abc`+ =.file"),
+ "/test_media_url/~!*()'%40%23%24%25%5E%26*abc%60%2B%20%3D.file"
+ )
+ self.assertEqual(self.storage.url("ab\0c"), "/test_media_url/ab%00c")
# should translate os path separator(s) to the url path separator
- self.assertEqual(self.storage.url("""a/b\\c.file"""),
- """/test_media_url/a/b/c.file""")
+ self.assertEqual(self.storage.url("""a/b\\c.file"""), "/test_media_url/a/b/c.file")
# #25905: remove leading slashes from file names to prevent unsafe url output
self.assertEqual(self.storage.url("/evil.com"), "/test_media_url/evil.com")
@@ -422,8 +416,7 @@ class FileStorageTests(TestCase):
self.storage.url('test.file')
# #22717: missing ending slash in base_url should be auto-corrected
- storage = self.storage_class(location=self.temp_dir,
- base_url='/no_ending_slash')
+ storage = self.storage_class(location=self.temp_dir, base_url='/no_ending_slash')
self.assertEqual(
storage.url('test.file'),
'%s%s' % (storage.base_url, 'test.file')
@@ -443,8 +436,7 @@ class FileStorageTests(TestCase):
dirs, files = self.storage.listdir('')
self.assertEqual(set(dirs), {'storage_dir_1'})
- self.assertEqual(set(files),
- {'storage_test_1', 'storage_test_2'})
+ self.assertEqual(set(files), {'storage_test_1', 'storage_test_2'})
self.storage.delete('storage_test_1')
self.storage.delete('storage_test_2')
@@ -470,8 +462,7 @@ class FileStorageTests(TestCase):
file = other_temp_storage.open(mixed_case, 'w')
file.write('storage contents')
file.close()
- self.assertEqual(os.path.join(self.temp_dir2, mixed_case),
- other_temp_storage.path(mixed_case))
+ self.assertEqual(os.path.join(self.temp_dir2, mixed_case), other_temp_storage.path(mixed_case))
other_temp_storage.delete(mixed_case)
def test_makedirs_race_handling(self):
@@ -496,13 +487,11 @@ class FileStorageTests(TestCase):
try:
os.makedirs = fake_makedirs
- self.storage.save('normal/test.file',
- ContentFile('saved normally'))
+ self.storage.save('normal/test.file', ContentFile('saved normally'))
with self.storage.open('normal/test.file') as f:
self.assertEqual(f.read(), b'saved normally')
- self.storage.save('raced/test.file',
- ContentFile('saved with race'))
+ self.storage.save('raced/test.file', ContentFile('saved with race'))
with self.storage.open('raced/test.file') as f:
self.assertEqual(f.read(), b'saved with race')