diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_contentstore.py b/common/lib/xmodule/xmodule/modulestore/tests/test_contentstore.py index f85c88d60b9b1e87be24cead1545ee0d8886f850..3740c2be8cfd9442b287a8b21f14eaabffe85b80 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_contentstore.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_contentstore.py @@ -154,10 +154,7 @@ class TestContentstore(unittest.TestCase): course1_assets, count = self.contentstore.get_all_content_for_course(self.course1_key) self.assertEqual(count, len(self.course1_files), course1_assets) for asset in course1_assets: - if deprecated: - parsed = AssetLocation.from_deprecated_string(asset['filename']) - else: - parsed = AssetLocation.from_string(asset['filename']) + parsed = AssetLocation.from_deprecated_string(asset['filename']) self.assertIn(parsed.name, self.course1_files) course1_assets, __ = self.contentstore.get_all_content_for_course(self.course1_key, 1, 1) diff --git a/common/test/data/static/picture1.jpg b/common/test/data/static/picture1.jpg index 1708d1bcca16de19199bd06da7f3ce9a869a01d9..eaf274572ec991781d33bf44a82c2a3f98a2f6b0 100644 Binary files a/common/test/data/static/picture1.jpg and b/common/test/data/static/picture1.jpg differ diff --git a/common/test/data/static/picture2.jpg b/common/test/data/static/picture2.jpg index 9285e05ced30e8aaa41012cb0655391f4027baed..5b41b93bb70b552847cd0dd0b45f5d0d19fb2bd8 100644 Binary files a/common/test/data/static/picture2.jpg and b/common/test/data/static/picture2.jpg differ diff --git a/common/test/data/static/picture3.jpg b/common/test/data/static/picture3.jpg index b3738a7f387e6109fb02d3ec3fb84b6b366adae9..cbed6063f201ccda8aec123a87d6ef438ef698da 100644 Binary files a/common/test/data/static/picture3.jpg and b/common/test/data/static/picture3.jpg differ