summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Apolloner <florian@apolloner.eu>2014-04-21 14:51:52 +0200
committerTim Graham <timograham@gmail.com>2014-04-21 08:58:41 -0400
commitd7de6ed07eda3968d50e9045ff585763845bb290 (patch)
tree334765f4b34b8d3d8526eb732c1d5c72c496ee71
parent62eb79fc4cc956b798e5c3a3be96101037ae9cb0 (diff)
[1.7.x] Fixed monkeypatching in a staticfiles test.
Backport of a4553e0510 from master
-rw-r--r--tests/staticfiles_tests/tests.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/staticfiles_tests/tests.py b/tests/staticfiles_tests/tests.py
index 9d49ab1927..dec38e239d 100644
--- a/tests/staticfiles_tests/tests.py
+++ b/tests/staticfiles_tests/tests.py
@@ -279,14 +279,16 @@ class TestConfiguration(StaticFilesTestCase):
command = collectstatic.Command()
self.assertFalse(command.is_local_storage())
- storage.staticfiles_storage = storage.FileSystemStorage()
+ collectstatic.staticfiles_storage = storage.FileSystemStorage()
command = collectstatic.Command()
self.assertTrue(command.is_local_storage())
- storage.staticfiles_storage = DummyStorage()
+ collectstatic.staticfiles_storage = DummyStorage()
command = collectstatic.Command()
self.assertFalse(command.is_local_storage())
finally:
+ staticfiles_storage._wrapped = empty
+ collectstatic.staticfiles_storage = staticfiles_storage
storage.staticfiles_storage = staticfiles_storage