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

Fixed error message test assertions under Python 3.3 

Thanks Florian Apolloner for testing.
This commit is contained in:
Claude Paroz 2013-02-04 18:00:19 +01:00
parent 7c5b244826
commit 40260bc30b
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/regressiontests/file_storage/tests.py
View File

@ -55,11 +55,9 @@ class GetStorageClassTests(SimpleTestCase):
"""
get_storage_class raises an error if the requested import don't exist.
"""
self.assertRaisesMessage(
ImproperlyConfigured,
"Error importing module storage: \"No module named storage\"",
get_storage_class,
'storage.NonExistingStorage')
with six.assertRaisesRegex(self, ImproperlyConfigured,
"Error importing module storage: \"No module named '?storage'?\""):
get_storage_class('storage.NonExistingStorage')
def test_get_nonexisting_storage_class(self):
"""
@ -77,13 +75,11 @@ 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.
six.assertRaisesRegex(self,
ImproperlyConfigured,
'Error importing module django.core.files.non_existing_storage: '
'"No module named non_existing_storage"',
get_storage_class,
'django.core.files.non_existing_storage.NonExistingStorage'
)
with six.assertRaisesRegex(self, ImproperlyConfigured,
"Error importing module django.core.files.non_existing_storage: "
"\"No module named '?(django.core.files.)?non_existing_storage'?\""):
get_storage_class(
'django.core.files.non_existing_storage.NonExistingStorage')
class FileStorageTests(unittest.TestCase):
storage_class = FileSystemStorage