Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed a test case introduced in r15538 by creating a test file with n…

…on-ASCII characters dynamically.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15541 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 0577edf61097f3e677905a202f2c0e62a6514646 1 parent 64b042b
@jezdez jezdez authored
View
1  tests/regressiontests/staticfiles_tests/apps/test/static/test/speçial.txt
@@ -1 +0,0 @@
-speçial in the app dir
View
14 tests/regressiontests/staticfiles_tests/tests.py
@@ -63,6 +63,16 @@ def setUp(self):
# since we're planning on changing that we need to clear out the cache.
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):
settings.DEBUG = self.old_debug
settings.MEDIA_ROOT = self.old_media_root
@@ -73,6 +83,8 @@ def tearDown(self):
settings.STATICFILES_DIRS = self.old_staticfiles_dirs
settings.STATICFILES_FINDERS = self.old_staticfiles_finders
settings.INSTALLED_APPS = self.old_installed_apps
+ if os.path.exists(self._nonascii_filepath):
+ os.unlink(self._nonascii_filepath)
def assertFileContains(self, filepath, text):
self.assertTrue(text in self._get_file(smart_unicode(filepath)),
@@ -151,7 +163,7 @@ def test_nonascii_filenames(self):
"""
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):
Please sign in to comment.
Something went wrong with that request. Please try again.