From 0577edf61097f3e677905a202f2c0e62a6514646 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Tue, 15 Feb 2011 18:15:38 +0000 Subject: [PATCH] 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 --- .../apps/test/static/test/speçial.txt | 1 - tests/regressiontests/staticfiles_tests/tests.py | 14 +++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) delete mode 100644 tests/regressiontests/staticfiles_tests/apps/test/static/test/speçial.txt diff --git a/tests/regressiontests/staticfiles_tests/apps/test/static/test/speçial.txt b/tests/regressiontests/staticfiles_tests/apps/test/static/test/speçial.txt deleted file mode 100644 index 5da2e16831..0000000000 --- a/tests/regressiontests/staticfiles_tests/apps/test/static/test/speçial.txt +++ /dev/null @@ -1 +0,0 @@ -speçial in the app dir \ No newline at end of file diff --git a/tests/regressiontests/staticfiles_tests/tests.py b/tests/regressiontests/staticfiles_tests/tests.py index 0e73e48480..9a2ca6a3ec 100644 --- a/tests/regressiontests/staticfiles_tests/tests.py +++ b/tests/regressiontests/staticfiles_tests/tests.py @@ -63,6 +63,16 @@ class StaticFilesTestCase(TestCase): # 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 @@ class StaticFilesTestCase(TestCase): 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 @@ class TestDefaults(object): """ 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):