test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed a test case introduced in r15538 by creating a test file with non-ASCII characters dynamically. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15541 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2011-02-15 18:15:38 +00:00
parent 64b042bb3c
commit 0577edf610
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/regressiontests/staticfiles_tests/apps/test/static/test/speçial.txt
View File

@ -1 +0,0 @@
speçial in the app dir

14
tests/regressiontests/staticfiles_tests/tests.py
View File

@ -63,6 +63,16 @@ class StaticFilesTestCase(TestCase):
# since we're planning on changing that we need to clear out the cache. # since we're planning on changing that we need to clear out the cache.
default_storage._wrapped = None default_storage._wrapped = None
# To make sure SVN doesn't hangs itself with the non-ASCII characters
# during checkout, we actually create one file dynamically.
self._nonascii_filepath = os.path.join(
TEST_ROOT, 'apps', 'test', 'static', 'test', u'fişier.txt')
f = codecs.open(self._nonascii_filepath, 'w', 'utf-8')
try:
f.write(u"fişier in the app dir")
finally:
f.close()
def tearDown(self): def tearDown(self):
settings.DEBUG = self.old_debug settings.DEBUG = self.old_debug
settings.MEDIA_ROOT = self.old_media_root settings.MEDIA_ROOT = self.old_media_root
@ -73,6 +83,8 @@ class StaticFilesTestCase(TestCase):
settings.STATICFILES_DIRS = self.old_staticfiles_dirs settings.STATICFILES_DIRS = self.old_staticfiles_dirs
settings.STATICFILES_FINDERS = self.old_staticfiles_finders settings.STATICFILES_FINDERS = self.old_staticfiles_finders
settings.INSTALLED_APPS = self.old_installed_apps settings.INSTALLED_APPS = self.old_installed_apps
if os.path.exists(self._nonascii_filepath):
os.unlink(self._nonascii_filepath)
def assertFileContains(self, filepath, text): def assertFileContains(self, filepath, text):
self.assertTrue(text in self._get_file(smart_unicode(filepath)), self.assertTrue(text in self._get_file(smart_unicode(filepath)),
@ -151,7 +163,7 @@ class TestDefaults(object):
""" """
Can find a file with non-ASCII character in an app static/ directory. Can find a file with non-ASCII character in an app static/ directory.
""" """
self.assertFileContains(u'test/speçial.txt', u'speçial in the app dir') self.assertFileContains(u'test/fişier.txt', u'fişier in the app dir')
class TestFindStatic(BuildStaticTestCase, TestDefaults): class TestFindStatic(BuildStaticTestCase, TestDefaults):