diff options
| author | David Evans <d@evans.io> | 2014-03-22 21:57:01 +0000 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-03-25 09:55:29 -0400 |
| commit | ddcbde41eec12f7a84b00635cdbf1c93d4e4d297 (patch) | |
| tree | 65c85761efa22801cb4c49e2082b5636429d18ba /tests/staticfiles_tests | |
| parent | 24604844866a0b28122a1c47ac85072ea05b9b71 (diff) | |
[1.7.x] Fixed #22315 -- str/bytes mismatch in staticfiles
Previously, `ManifestFilesMixin.read_manifest` failed in Python 3
because `json.loads` accepts `str` not `bytes`.
Backport of 86dcac4634 from master
Diffstat (limited to 'tests/staticfiles_tests')
| -rw-r--r-- | tests/staticfiles_tests/tests.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/staticfiles_tests/tests.py b/tests/staticfiles_tests/tests.py index 21ecf84bbc..4d2ba30c8c 100644 --- a/tests/staticfiles_tests/tests.py +++ b/tests/staticfiles_tests/tests.py @@ -662,6 +662,11 @@ class TestCollectionManifestStorage(TestHashedFiles, BaseCollectionTestCase, storage.staticfiles_storage.manifest_version, force_text(manifest_content)) + def test_parse_cache(self): + hashed_files = storage.staticfiles_storage.hashed_files + manifest = storage.staticfiles_storage.load_manifest() + self.assertEqual(hashed_files, manifest) + # we set DEBUG to False here since the template tag wouldn't work otherwise @override_settings(**dict( |