Author: lukeplant
Date: 2010-09-10 08:09:19 -0500 (Fri, 10 Sep 2010)
New Revision: 13706
Modified:
django/branches/releases/1.2.X/
django/branches/releases/1.2.X/django/core/cache/backends/filebased.py
Log:
[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.
Property changes on: django/branches/releases/1.2.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-13360,13434,13480,13574,13600,13638,13652,13664,13666,13668,13680,13683,13685,13687-13688,13690,13694,13696,13701-13702
+
/django/trunk:1-13360,13434,13480,13574,13600,13638,13652,13664,13666,13668,13680,13683,13685,13687-13688,13690,13694,13696,13701-13702,13705
Modified: django/branches/releases/1.2.X/django/core/cache/backends/filebased.py
===================================================================
--- django/branches/releases/1.2.X/django/core/cache/backends/filebased.py
2010-09-10 13:03:02 UTC (rev 13705)
+++ django/branches/releases/1.2.X/django/core/cache/backends/filebased.py
2010-09-10 13:09:19 UTC (rev 13706)
@@ -116,7 +116,7 @@
return
try:
- filelist = os.listdir(self._dir)
+ filelist = sorted(os.listdir(self._dir))
except (IOError, OSError):
return
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
