summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2010-09-10 13:09:19 +0000
committerLuke Plant <L.Plant.98@cantab.net>2010-09-10 13:09:19 +0000
commit6e1c46dab96395b437f77ee0c39deffa47042408 (patch)
tree2208b22f5504a0b00d0f3318440a3302237a7bf7
parent6ea90256d767bb79649df83ec2f5b0e265d6871b (diff)
[1.2.X] Fixed #14250 - FileBasedCacheTests.test_cull test failure
This patch makes the cull behaviour (which files deleted and how many deleted) deterministic. Backport of [13705] from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/cache/backends/filebased.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/core/cache/backends/filebased.py b/django/core/cache/backends/filebased.py
index fe833336d0..6057f11ef7 100644
--- a/django/core/cache/backends/filebased.py
+++ b/django/core/cache/backends/filebased.py
@@ -116,7 +116,7 @@ class CacheClass(BaseCache):
return
try:
- filelist = os.listdir(self._dir)
+ filelist = sorted(os.listdir(self._dir))
except (IOError, OSError):
return